diff --git a/assets/swagger.json b/assets/swagger.json
index 4304ff97a639f..69cdc734800cd 100644
--- a/assets/swagger.json
+++ b/assets/swagger.json
@@ -245,7 +245,7 @@
             },
             "collectionFormat": "multi",
             "description": "the project names to restrict returned list applications.",
-            "name": "project",
+            "name": "projects",
             "in": "query"
           },
           {
@@ -509,7 +509,7 @@
             },
             "collectionFormat": "multi",
             "description": "the project names to restrict returned list applications.",
-            "name": "project",
+            "name": "projects",
             "in": "query"
           },
           {
@@ -3147,7 +3147,7 @@
             },
             "collectionFormat": "multi",
             "description": "the project names to restrict returned list applications.",
-            "name": "project",
+            "name": "projects",
             "in": "query"
           },
           {
diff --git a/cmd/argocd-git-ask-pass/commands/argocd_git_ask_pass.go b/cmd/argocd-git-ask-pass/commands/argocd_git_ask_pass.go
index 8c3596562f481..858088b548434 100644
--- a/cmd/argocd-git-ask-pass/commands/argocd_git_ask_pass.go
+++ b/cmd/argocd-git-ask-pass/commands/argocd_git_ask_pass.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/argoproj/argo-cd/v2/reposerver/askpass"
 	"github.com/argoproj/argo-cd/v2/util/errors"
@@ -35,7 +36,7 @@ func NewCommand() *cobra.Command {
 			if nonce == "" {
 				errors.CheckError(fmt.Errorf("%s is not set", git.ASKPASS_NONCE_ENV))
 			}
-			conn, err := grpc_util.BlockingDial(context.Background(), "unix", askpass.SocketPath, nil, grpc.WithInsecure())
+			conn, err := grpc_util.BlockingDial(context.Background(), "unix", askpass.SocketPath, nil, grpc.WithTransportCredentials(insecure.NewCredentials()))
 			errors.CheckError(err)
 			defer io.Close(conn)
 			client := askpass.NewAskPassServiceClient(conn)
diff --git a/cmd/argocd/commands/app.go b/cmd/argocd/commands/app.go
index d8d26fb72fb34..67124fb75ee92 100644
--- a/cmd/argocd/commands/app.go
+++ b/cmd/argocd/commands/app.go
@@ -153,7 +153,7 @@ func NewApplicationCreateCommand(clientOpts *argocdclient.ClientOptions) *cobra.
 				conn, appIf := argocdClient.NewApplicationClientOrDie()
 				defer argoio.Close(conn)
 				appCreateRequest := applicationpkg.ApplicationCreateRequest{
-					Application: *app,
+					Application: app,
 					Upsert:      &upsert,
 					Validate:    &appOpts.Validate,
 				}
@@ -310,16 +310,16 @@ func NewApplicationLogsCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
 				stream, err := appIf.PodLogs(context.Background(), &applicationpkg.ApplicationPodLogsQuery{
 					Name:         &appName,
 					Group:        &group,
-					Namespace:    namespace,
+					Namespace:    pointer.String(namespace),
 					Kind:         &kind,
 					ResourceName: &resourceName,
-					Follow:       follow,
-					TailLines:    tail,
-					SinceSeconds: sinceSeconds,
+					Follow:       pointer.Bool(follow),
+					TailLines:    pointer.Int64(tail),
+					SinceSeconds: pointer.Int64(sinceSeconds),
 					UntilTime:    &untilTime,
 					Filter:       &filter,
-					Container:    container,
-					Previous:     previous,
+					Container:    pointer.String(container),
+					Previous:     pointer.Bool(previous),
 				})
 				if err != nil {
 					log.Fatalf("failed to get pod logs: %v", err)
@@ -341,8 +341,8 @@ func NewApplicationLogsCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
 						}
 						log.Fatalf("stream read failed: %v", err)
 					}
-					if !msg.Last {
-						fmt.Println(msg.Content)
+					if !msg.GetLast() {
+						fmt.Println(msg.GetContent())
 					} else {
 						return
 					}
@@ -553,7 +553,7 @@ func NewApplicationSetCommand(clientOpts *argocdclient.ClientOptions) *cobra.Com
 			setParameterOverrides(app, appOpts.Parameters)
 			_, err = appIf.UpdateSpec(ctx, &applicationpkg.ApplicationUpdateSpecRequest{
 				Name:     &app.Name,
-				Spec:     app.Spec,
+				Spec:     &app.Spec,
 				Validate: &appOpts.Validate,
 			})
 			errors.CheckError(err)
@@ -690,7 +690,7 @@ func NewApplicationUnsetCommand(clientOpts *argocdclient.ClientOptions) *cobra.C
 			cmdutil.SetAppSpecOptions(c.Flags(), &app.Spec, &appOpts)
 			_, err = appIf.UpdateSpec(context.Background(), &applicationpkg.ApplicationUpdateSpecRequest{
 				Name:     &app.Name,
-				Spec:     app.Spec,
+				Spec:     &app.Spec,
 				Validate: &appOpts.Validate,
 			})
 			errors.CheckError(err)
@@ -839,7 +839,7 @@ func NewApplicationDiffCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
 			if revision != "" {
 				q := applicationpkg.ApplicationManifestQuery{
 					Name:     &appName,
-					Revision: revision,
+					Revision: &revision,
 				}
 				res, err := appIf.GetManifests(context.Background(), &q)
 				errors.CheckError(err)
@@ -1121,7 +1121,7 @@ func NewApplicationListCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
 		Run: func(c *cobra.Command, args []string) {
 			conn, appIf := headless.NewClientOrDie(clientOpts, c).NewApplicationClientOrDie()
 			defer argoio.Close(conn)
-			apps, err := appIf.List(context.Background(), &applicationpkg.ApplicationQuery{Selector: selector})
+			apps, err := appIf.List(context.Background(), &applicationpkg.ApplicationQuery{Selector: pointer.String(selector)})
 			errors.CheckError(err)
 			appList := apps.Items
 			if len(projects) != 0 {
@@ -1193,10 +1193,10 @@ const (
 	resourceFieldNameWithNamespaceCount = 2
 )
 
-func parseSelectedResources(resources []string) []argoappv1.SyncOperationResource {
-	var selectedResources []argoappv1.SyncOperationResource
+func parseSelectedResources(resources []string) []*argoappv1.SyncOperationResource {
+	var selectedResources []*argoappv1.SyncOperationResource
 	if resources != nil {
-		selectedResources = []argoappv1.SyncOperationResource{}
+		selectedResources = []*argoappv1.SyncOperationResource{}
 		for _, r := range resources {
 			fields := strings.Split(r, resourceFieldDelimiter)
 			if len(fields) != resourceFieldCount {
@@ -1218,7 +1218,7 @@ func parseSelectedResources(resources []string) []argoappv1.SyncOperationResourc
 				Name:      name,
 				Namespace: namespace,
 			}
-			selectedResources = append(selectedResources, rsrc)
+			selectedResources = append(selectedResources, &rsrc)
 		}
 	}
 	return selectedResources
@@ -1267,7 +1267,7 @@ func NewApplicationWaitCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
 			closer, appIf := acdClient.NewApplicationClientOrDie()
 			defer argoio.Close(closer)
 			if selector != "" {
-				list, err := appIf.List(context.Background(), &applicationpkg.ApplicationQuery{Selector: selector})
+				list, err := appIf.List(context.Background(), &applicationpkg.ApplicationQuery{Selector: pointer.String(selector)})
 				errors.CheckError(err)
 				for _, i := range list.Items {
 					appNames = append(appNames, i.Name)
@@ -1353,7 +1353,7 @@ func NewApplicationSyncCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
 
 			appNames := args
 			if selector != "" {
-				list, err := appIf.List(context.Background(), &applicationpkg.ApplicationQuery{Selector: selector})
+				list, err := appIf.List(context.Background(), &applicationpkg.ApplicationQuery{Selector: pointer.String(selector)})
 				errors.CheckError(err)
 				// unlike list, we'd want to fail if nothing was found
 				if len(list.Items) == 0 {
@@ -1371,7 +1371,7 @@ func NewApplicationSyncCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
 
 					q := applicationpkg.ApplicationManifestQuery{
 						Name:     &appName,
-						Revision: revision,
+						Revision: &revision,
 					}
 
 					res, err := appIf.GetManifests(ctx, &q)
@@ -1444,10 +1444,10 @@ func NewApplicationSyncCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
 
 				syncReq := applicationpkg.ApplicationSyncRequest{
 					Name:        &appName,
-					DryRun:      dryRun,
-					Revision:    revision,
+					DryRun:      &dryRun,
+					Revision:    &revision,
 					Resources:   selectedResources,
-					Prune:       prune,
+					Prune:       &prune,
 					Manifests:   localObjsStrings,
 					Infos:       getInfos(infos),
 					SyncOptions: syncOptionsFactory(),
@@ -1582,7 +1582,7 @@ func (rs *resourceState) Merge(newState *resourceState) bool {
 	return updated
 }
 
-func getResourceStates(app *argoappv1.Application, selectedResources []argoappv1.SyncOperationResource) []*resourceState {
+func getResourceStates(app *argoappv1.Application, selectedResources []*argoappv1.SyncOperationResource) []*resourceState {
 	var states []*resourceState
 	resourceByKey := make(map[kube.ResourceKey]argoappv1.ResourceStatus)
 	for i := range app.Status.Resources {
@@ -1627,9 +1627,15 @@ func getResourceStates(app *argoappv1.Application, selectedResources []argoappv1
 	}
 	// filter out not selected resources
 	if len(selectedResources) > 0 {
+		r := []argoappv1.SyncOperationResource{}
+		for _, res := range selectedResources {
+			if res != nil {
+				r = append(r, *res)
+			}
+		}
 		for i := len(states) - 1; i >= 0; i-- {
 			res := states[i]
-			if !argo.ContainsSyncResource(res.Name, res.Namespace, schema.GroupVersionKind{Group: res.Group, Kind: res.Kind}, selectedResources) {
+			if !argo.ContainsSyncResource(res.Name, res.Namespace, schema.GroupVersionKind{Group: res.Group, Kind: res.Kind}, r) {
 				states = append(states[:i], states[i+1:]...)
 			}
 		}
@@ -1637,7 +1643,7 @@ func getResourceStates(app *argoappv1.Application, selectedResources []argoappv1
 	return states
 }
 
-func groupResourceStates(app *argoappv1.Application, selectedResources []argoappv1.SyncOperationResource) map[string]*resourceState {
+func groupResourceStates(app *argoappv1.Application, selectedResources []*argoappv1.SyncOperationResource) map[string]*resourceState {
 	resStates := make(map[string]*resourceState)
 	for _, result := range getResourceStates(app, selectedResources) {
 		key := result.Key()
@@ -1668,7 +1674,7 @@ func checkResourceStatus(watch watchOpts, healthStatus string, syncStatus string
 
 const waitFormatString = "%s\t%5s\t%10s\t%10s\t%20s\t%8s\t%7s\t%10s\t%s\n"
 
-func waitOnApplicationStatus(acdClient argocdclient.Client, appName string, timeout uint, watch watchOpts, selectedResources []argoappv1.SyncOperationResource) (*argoappv1.Application, error) {
+func waitOnApplicationStatus(acdClient argocdclient.Client, appName string, timeout uint, watch watchOpts, selectedResources []*argoappv1.SyncOperationResource) (*argoappv1.Application, error) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
@@ -1921,8 +1927,8 @@ func NewApplicationRollbackCommand(clientOpts *argocdclient.ClientOptions) *cobr
 
 			_, err = appIf.Rollback(ctx, &applicationpkg.ApplicationRollbackRequest{
 				Name:  &appName,
-				ID:    depInfo.ID,
-				Prune: prune,
+				Id:    pointer.Int64(depInfo.ID),
+				Prune: pointer.Bool(prune),
 			})
 			errors.CheckError(err)
 
@@ -1990,7 +1996,7 @@ func NewApplicationManifestsCommand(clientOpts *argocdclient.ClientOptions) *cob
 				if revision != "" {
 					q := applicationpkg.ApplicationManifestQuery{
 						Name:     &appName,
-						Revision: revision,
+						Revision: pointer.String(revision),
 					}
 					res, err := appIf.GetManifests(ctx, &q)
 					errors.CheckError(err)
@@ -2079,7 +2085,7 @@ func NewApplicationEditCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
 
 				var appOpts cmdutil.AppOptions
 				cmdutil.SetAppSpecOptions(c.Flags(), &app.Spec, &appOpts)
-				_, err = appIf.UpdateSpec(context.Background(), &applicationpkg.ApplicationUpdateSpecRequest{Name: &app.Name, Spec: updatedSpec, Validate: &appOpts.Validate})
+				_, err = appIf.UpdateSpec(context.Background(), &applicationpkg.ApplicationUpdateSpecRequest{Name: &app.Name, Spec: &updatedSpec, Validate: &appOpts.Validate})
 				if err != nil {
 					return fmt.Errorf("Failed to update application spec:\n%v", err)
 				}
@@ -2153,8 +2159,8 @@ func NewApplicationPatchCommand(clientOpts *argocdclient.ClientOptions) *cobra.C
 
 			patchedApp, err := appIf.Patch(context.Background(), &applicationpkg.ApplicationPatchRequest{
 				Name:      &appName,
-				Patch:     patch,
-				PatchType: patchType,
+				Patch:     &patch,
+				PatchType: &patchType,
 			})
 			errors.CheckError(err)
 
@@ -2246,13 +2252,13 @@ func NewApplicationPatchResourceCommand(clientOpts *argocdclient.ClientOptions)
 			gvk := obj.GroupVersionKind()
 			_, err = appIf.PatchResource(ctx, &applicationpkg.ApplicationResourcePatchRequest{
 				Name:         &appName,
-				Namespace:    obj.GetNamespace(),
-				ResourceName: obj.GetName(),
-				Version:      gvk.Version,
-				Group:        gvk.Group,
-				Kind:         gvk.Kind,
-				Patch:        patch,
-				PatchType:    patchType,
+				Namespace:    pointer.String(obj.GetNamespace()),
+				ResourceName: pointer.String(obj.GetName()),
+				Version:      pointer.String(gvk.Version),
+				Group:        pointer.String(gvk.Group),
+				Kind:         pointer.String(gvk.Kind),
+				Patch:        pointer.String(patch),
+				PatchType:    pointer.String(patchType),
 			})
 			errors.CheckError(err)
 			log.Infof("Resource '%s' patched", obj.GetName())
@@ -2302,11 +2308,11 @@ func NewApplicationDeleteResourceCommand(clientOpts *argocdclient.ClientOptions)
 			gvk := obj.GroupVersionKind()
 			_, err = appIf.DeleteResource(ctx, &applicationpkg.ApplicationResourceDeleteRequest{
 				Name:         &appName,
-				Namespace:    obj.GetNamespace(),
-				ResourceName: obj.GetName(),
-				Version:      gvk.Version,
-				Group:        gvk.Group,
-				Kind:         gvk.Kind,
+				Namespace:    pointer.String(obj.GetNamespace()),
+				ResourceName: pointer.String(obj.GetName()),
+				Version:      pointer.String(gvk.Version),
+				Group:        pointer.String(gvk.Group),
+				Kind:         pointer.String(gvk.Kind),
 				Force:        &force,
 				Orphan:       &orphan,
 			})
diff --git a/cmd/argocd/commands/app_actions.go b/cmd/argocd/commands/app_actions.go
index dc8d2fc8233f0..a6af4c22da504 100644
--- a/cmd/argocd/commands/app_actions.go
+++ b/cmd/argocd/commands/app_actions.go
@@ -11,6 +11,7 @@ import (
 	"github.com/ghodss/yaml"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"k8s.io/utils/pointer"
 
 	"github.com/argoproj/argo-cd/v2/cmd/argocd/commands/headless"
 	argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient"
@@ -71,10 +72,11 @@ func NewApplicationResourceActionsListCommand(clientOpts *argocdclient.ClientOpt
 			gvk := obj.GroupVersionKind()
 			availActionsForResource, err := appIf.ListResourceActions(ctx, &applicationpkg.ApplicationResourceRequest{
 				Name:         &appName,
-				Namespace:    obj.GetNamespace(),
-				ResourceName: obj.GetName(),
-				Group:        gvk.Group,
-				Kind:         gvk.Kind,
+				Namespace:    pointer.String(obj.GetNamespace()),
+				ResourceName: pointer.String(obj.GetName()),
+				Group:        pointer.String(gvk.Group),
+				Kind:         pointer.String(gvk.Kind),
+				Version:      pointer.String(gvk.GroupVersion().Version),
 			})
 			errors.CheckError(err)
 			for _, action := range availActionsForResource.Actions {
@@ -162,11 +164,12 @@ func NewApplicationResourceActionsRunCommand(clientOpts *argocdclient.ClientOpti
 			objResourceName := obj.GetName()
 			_, err := appIf.RunResourceAction(context.Background(), &applicationpkg.ResourceActionRunRequest{
 				Name:         &appName,
-				Namespace:    obj.GetNamespace(),
-				ResourceName: objResourceName,
-				Group:        gvk.Group,
-				Kind:         gvk.Kind,
-				Action:       actionName,
+				Namespace:    pointer.String(obj.GetNamespace()),
+				ResourceName: pointer.String(objResourceName),
+				Group:        pointer.String(gvk.Group),
+				Kind:         pointer.String(gvk.Kind),
+				Version:      pointer.String(gvk.GroupVersion().Version),
+				Action:       pointer.String(actionName),
 			})
 			errors.CheckError(err)
 		}
diff --git a/cmpserver/apiclient/clientset.go b/cmpserver/apiclient/clientset.go
index f9ff192daff7f..7f39527bcb380 100644
--- a/cmpserver/apiclient/clientset.go
+++ b/cmpserver/apiclient/clientset.go
@@ -8,6 +8,7 @@ import (
 	grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
 	log "github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 
 	grpc_util "github.com/argoproj/argo-cd/v2/util/grpc"
 	"github.com/argoproj/argo-cd/v2/util/io"
@@ -47,7 +48,7 @@ func NewConnection(address string) (*grpc.ClientConn, error) {
 		grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(MaxGRPCMessageSize), grpc.MaxCallSendMsgSize(MaxGRPCMessageSize)),
 	}
 
-	dialOpts = append(dialOpts, grpc.WithInsecure())
+	dialOpts = append(dialOpts, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	conn, err := grpc_util.BlockingDial(context.Background(), "unix", address, nil, dialOpts...)
 	if err != nil {
 		log.Errorf("Unable to connect to config management plugin service with address %s", address)
diff --git a/go.mod b/go.mod
index 4705f80eb3e25..5555d50ef242a 100644
--- a/go.mod
+++ b/go.mod
@@ -80,8 +80,8 @@ require (
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
 	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa
-	google.golang.org/grpc v1.42.0
-	google.golang.org/protobuf v1.27.1
+	google.golang.org/grpc v1.45.0
+	google.golang.org/protobuf v1.28.0
 	gopkg.in/go-playground/webhooks.v5 v5.11.0
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.23.3
@@ -240,8 +240,6 @@ replace (
 	github.com/grpc-ecosystem/grpc-gateway => github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/improbable-eng/grpc-web => github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a
 
-	google.golang.org/grpc => google.golang.org/grpc v1.15.0
-
 	// https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280
 	k8s.io/api => k8s.io/api v0.23.1
 	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.1
diff --git a/go.sum b/go.sum
index 0b6aee7da4059..5951a5cf26bb7 100644
--- a/go.sum
+++ b/go.sum
@@ -216,9 +216,15 @@ github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp
 github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod h1:P1wt9Z3DP8O6W3rvwCt0REIlshg1InHImaLW0t3ObY0=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
+github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo=
@@ -295,6 +301,15 @@ github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao
 github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
 github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
+github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws=
@@ -454,6 +469,7 @@ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogits/go-gogs-client v0.0.0-20190616193657-5a05380e4bc2 h1:BbwX8wsMRDZRdNYxAna+4ls3wvMKJyn4PT6Zk1CPxP4=
 github.com/gogits/go-gogs-client v0.0.0-20190616193657-5a05380e4bc2/go.mod h1:cY2AIrMgHm6oOHmR7jY+9TtjzSjQ3iG7tURJG3Y6XH0=
+github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
@@ -474,7 +490,6 @@ github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4er
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
@@ -736,6 +751,7 @@ github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i
 github.com/lusis/go-slackbot v0.0.0-20180109053408-401027ccfef5/go.mod h1:c2mYKRyMb1BPkO5St0c/ps62L4S0W2NAkaTXj9qEI+0=
 github.com/lusis/slack-test v0.0.0-20190426140909-c40012f20018/go.mod h1:sFlOUpQL1YcjhFVXhg1CG8ZASEs/Mf1oVb6H75JL/zg=
 github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
+github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
@@ -1207,7 +1223,7 @@ golang.org/x/exp v0.0.0-20210901193431-a062eea981d2/go.mod h1:a3o/VtDNHN+dCVLEpz
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -1465,6 +1481,7 @@ golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -1666,8 +1683,40 @@ google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ6
 google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa h1:I0YcKz0I7OAhddo7ya8kMnvprhcWM045PmkBdMO9zN0=
 google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/grpc v1.15.0 h1:Az/KuahOM4NAidTEuJCv/RonAA7rYsTPkqXVjr+8OOw=
-google.golang.org/grpc v1.15.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
+google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
+google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
+google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
+google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
+google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
+google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M=
+google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
@@ -1677,8 +1726,9 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
+google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
diff --git a/hack/installers/install-codegen-go-tools.sh b/hack/installers/install-codegen-go-tools.sh
index 81098c0f4b5ae..c6ebfc8902cee 100755
--- a/hack/installers/install-codegen-go-tools.sh
+++ b/hack/installers/install-codegen-go-tools.sh
@@ -22,7 +22,7 @@ export GOBIN="${SRCROOT}/dist"
 mkdir -p $GOBIN
 
 # protoc-gen-go* is used to generate <service>.pb.go from .proto files
-#go_mod_install github.com/golang/protobuf/protoc-gen-go
+# go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.0
 #go_mod_install github.com/gogo/protobuf/protoc-gen-gogo
 go_mod_install github.com/gogo/protobuf/protoc-gen-gogofast
 
diff --git a/pkg/apiclient/apiclient.go b/pkg/apiclient/apiclient.go
index 80dd27dd8b66c..882f651ae2c66 100644
--- a/pkg/apiclient/apiclient.go
+++ b/pkg/apiclient/apiclient.go
@@ -772,7 +772,7 @@ func (c *client) WatchApplicationWithRetry(ctx context.Context, appName string,
 			conn, appIf, err := c.NewApplicationClient()
 			if err == nil {
 				var wc applicationpkg.ApplicationService_WatchClient
-				wc, err = appIf.Watch(ctx, &applicationpkg.ApplicationQuery{Name: &appName, ResourceVersion: revision})
+				wc, err = appIf.Watch(ctx, &applicationpkg.ApplicationQuery{Name: &appName, ResourceVersion: &revision})
 				if err == nil {
 					for {
 						var appEvent *v1alpha1.ApplicationWatchEvent
diff --git a/pkg/apiclient/application/application.pb.go b/pkg/apiclient/application/application.pb.go
index 050f2cd0c1d7a..c239a24ffdd67 100644
--- a/pkg/apiclient/application/application.pb.go
+++ b/pkg/apiclient/application/application.pb.go
@@ -12,7 +12,6 @@ import (
 	fmt "fmt"
 	v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	apiclient "github.com/argoproj/argo-cd/v2/reposerver/apiclient"
-	_ "github.com/gogo/protobuf/gogoproto"
 	github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
@@ -44,13 +43,13 @@ type ApplicationQuery struct {
 	// forces application reconciliation if set to true
 	Refresh *string `protobuf:"bytes,2,opt,name=refresh" json:"refresh,omitempty"`
 	// the project names to restrict returned list applications
-	Projects []string `protobuf:"bytes,3,rep,name=project" json:"project,omitempty"`
+	Projects []string `protobuf:"bytes,3,rep,name=projects" json:"projects,omitempty"`
 	// when specified with a watch call, shows changes that occur after that particular version of a resource.
-	ResourceVersion string `protobuf:"bytes,4,opt,name=resourceVersion" json:"resourceVersion"`
+	ResourceVersion *string `protobuf:"bytes,4,opt,name=resourceVersion" json:"resourceVersion,omitempty"`
 	// the selector to restrict returned list to applications only with matched labels
-	Selector string `protobuf:"bytes,5,opt,name=selector" json:"selector"`
+	Selector *string `protobuf:"bytes,5,opt,name=selector" json:"selector,omitempty"`
 	// the repoURL to restrict returned list applications
-	Repo                 string   `protobuf:"bytes,6,opt,name=repo" json:"repo"`
+	Repo                 *string  `protobuf:"bytes,6,opt,name=repo" json:"repo,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -111,22 +110,22 @@ func (m *ApplicationQuery) GetProjects() []string {
 }
 
 func (m *ApplicationQuery) GetResourceVersion() string {
-	if m != nil {
-		return m.ResourceVersion
+	if m != nil && m.ResourceVersion != nil {
+		return *m.ResourceVersion
 	}
 	return ""
 }
 
 func (m *ApplicationQuery) GetSelector() string {
-	if m != nil {
-		return m.Selector
+	if m != nil && m.Selector != nil {
+		return *m.Selector
 	}
 	return ""
 }
 
 func (m *ApplicationQuery) GetRepo() string {
-	if m != nil {
-		return m.Repo
+	if m != nil && m.Repo != nil {
+		return *m.Repo
 	}
 	return ""
 }
@@ -239,9 +238,9 @@ func (m *RevisionMetadataQuery) GetRevision() string {
 // ApplicationEventsQuery is a query for application resource events
 type ApplicationResourceEventsQuery struct {
 	Name                 *string  `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
-	ResourceNamespace    string   `protobuf:"bytes,2,req,name=resourceNamespace" json:"resourceNamespace"`
-	ResourceName         string   `protobuf:"bytes,3,req,name=resourceName" json:"resourceName"`
-	ResourceUID          string   `protobuf:"bytes,4,req,name=resourceUID" json:"resourceUID"`
+	ResourceNamespace    *string  `protobuf:"bytes,2,req,name=resourceNamespace" json:"resourceNamespace,omitempty"`
+	ResourceName         *string  `protobuf:"bytes,3,req,name=resourceName" json:"resourceName,omitempty"`
+	ResourceUID          *string  `protobuf:"bytes,4,req,name=resourceUID" json:"resourceUID,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -288,22 +287,22 @@ func (m *ApplicationResourceEventsQuery) GetName() string {
 }
 
 func (m *ApplicationResourceEventsQuery) GetResourceNamespace() string {
-	if m != nil {
-		return m.ResourceNamespace
+	if m != nil && m.ResourceNamespace != nil {
+		return *m.ResourceNamespace
 	}
 	return ""
 }
 
 func (m *ApplicationResourceEventsQuery) GetResourceName() string {
-	if m != nil {
-		return m.ResourceName
+	if m != nil && m.ResourceName != nil {
+		return *m.ResourceName
 	}
 	return ""
 }
 
 func (m *ApplicationResourceEventsQuery) GetResourceUID() string {
-	if m != nil {
-		return m.ResourceUID
+	if m != nil && m.ResourceUID != nil {
+		return *m.ResourceUID
 	}
 	return ""
 }
@@ -311,7 +310,7 @@ func (m *ApplicationResourceEventsQuery) GetResourceUID() string {
 // ManifestQuery is a query for manifest resources
 type ApplicationManifestQuery struct {
 	Name                 *string  `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
-	Revision             string   `protobuf:"bytes,2,opt,name=revision" json:"revision"`
+	Revision             *string  `protobuf:"bytes,2,opt,name=revision" json:"revision,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -358,8 +357,8 @@ func (m *ApplicationManifestQuery) GetName() string {
 }
 
 func (m *ApplicationManifestQuery) GetRevision() string {
-	if m != nil {
-		return m.Revision
+	if m != nil && m.Revision != nil {
+		return *m.Revision
 	}
 	return ""
 }
@@ -404,12 +403,12 @@ func (m *ApplicationResponse) XXX_DiscardUnknown() {
 var xxx_messageInfo_ApplicationResponse proto.InternalMessageInfo
 
 type ApplicationCreateRequest struct {
-	Application          v1alpha1.Application `protobuf:"bytes,1,req,name=application" json:"application"`
-	Upsert               *bool                `protobuf:"varint,2,opt,name=upsert" json:"upsert,omitempty"`
-	Validate             *bool                `protobuf:"varint,3,opt,name=validate" json:"validate,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
-	XXX_unrecognized     []byte               `json:"-"`
-	XXX_sizecache        int32                `json:"-"`
+	Application          *v1alpha1.Application `protobuf:"bytes,1,req,name=application" json:"application,omitempty"`
+	Upsert               *bool                 `protobuf:"varint,2,opt,name=upsert" json:"upsert,omitempty"`
+	Validate             *bool                 `protobuf:"varint,3,opt,name=validate" json:"validate,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
 func (m *ApplicationCreateRequest) Reset()         { *m = ApplicationCreateRequest{} }
@@ -445,11 +444,11 @@ func (m *ApplicationCreateRequest) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ApplicationCreateRequest proto.InternalMessageInfo
 
-func (m *ApplicationCreateRequest) GetApplication() v1alpha1.Application {
+func (m *ApplicationCreateRequest) GetApplication() *v1alpha1.Application {
 	if m != nil {
 		return m.Application
 	}
-	return v1alpha1.Application{}
+	return nil
 }
 
 func (m *ApplicationCreateRequest) GetUpsert() bool {
@@ -633,19 +632,19 @@ func (m *SyncOptions) GetItems() []string {
 
 // ApplicationSyncRequest is a request to apply the config state to live state
 type ApplicationSyncRequest struct {
-	Name                 *string                          `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
-	Revision             string                           `protobuf:"bytes,2,opt,name=revision" json:"revision"`
-	DryRun               bool                             `protobuf:"varint,3,opt,name=dryRun" json:"dryRun"`
-	Prune                bool                             `protobuf:"varint,4,opt,name=prune" json:"prune"`
-	Strategy             *v1alpha1.SyncStrategy           `protobuf:"bytes,5,opt,name=strategy" json:"strategy,omitempty"`
-	Resources            []v1alpha1.SyncOperationResource `protobuf:"bytes,7,rep,name=resources" json:"resources"`
-	Manifests            []string                         `protobuf:"bytes,8,rep,name=manifests" json:"manifests,omitempty"`
-	Infos                []*v1alpha1.Info                 `protobuf:"bytes,9,rep,name=infos" json:"infos,omitempty"`
-	RetryStrategy        *v1alpha1.RetryStrategy          `protobuf:"bytes,10,opt,name=retryStrategy" json:"retryStrategy,omitempty"`
-	SyncOptions          *SyncOptions                     `protobuf:"bytes,11,opt,name=syncOptions" json:"syncOptions,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                         `json:"-"`
-	XXX_unrecognized     []byte                           `json:"-"`
-	XXX_sizecache        int32                            `json:"-"`
+	Name                 *string                           `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
+	Revision             *string                           `protobuf:"bytes,2,opt,name=revision" json:"revision,omitempty"`
+	DryRun               *bool                             `protobuf:"varint,3,opt,name=dryRun" json:"dryRun,omitempty"`
+	Prune                *bool                             `protobuf:"varint,4,opt,name=prune" json:"prune,omitempty"`
+	Strategy             *v1alpha1.SyncStrategy            `protobuf:"bytes,5,opt,name=strategy" json:"strategy,omitempty"`
+	Resources            []*v1alpha1.SyncOperationResource `protobuf:"bytes,7,rep,name=resources" json:"resources,omitempty"`
+	Manifests            []string                          `protobuf:"bytes,8,rep,name=manifests" json:"manifests,omitempty"`
+	Infos                []*v1alpha1.Info                  `protobuf:"bytes,9,rep,name=infos" json:"infos,omitempty"`
+	RetryStrategy        *v1alpha1.RetryStrategy           `protobuf:"bytes,10,opt,name=retryStrategy" json:"retryStrategy,omitempty"`
+	SyncOptions          *SyncOptions                      `protobuf:"bytes,11,opt,name=syncOptions" json:"syncOptions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                          `json:"-"`
+	XXX_unrecognized     []byte                            `json:"-"`
+	XXX_sizecache        int32                             `json:"-"`
 }
 
 func (m *ApplicationSyncRequest) Reset()         { *m = ApplicationSyncRequest{} }
@@ -689,22 +688,22 @@ func (m *ApplicationSyncRequest) GetName() string {
 }
 
 func (m *ApplicationSyncRequest) GetRevision() string {
-	if m != nil {
-		return m.Revision
+	if m != nil && m.Revision != nil {
+		return *m.Revision
 	}
 	return ""
 }
 
 func (m *ApplicationSyncRequest) GetDryRun() bool {
-	if m != nil {
-		return m.DryRun
+	if m != nil && m.DryRun != nil {
+		return *m.DryRun
 	}
 	return false
 }
 
 func (m *ApplicationSyncRequest) GetPrune() bool {
-	if m != nil {
-		return m.Prune
+	if m != nil && m.Prune != nil {
+		return *m.Prune
 	}
 	return false
 }
@@ -716,7 +715,7 @@ func (m *ApplicationSyncRequest) GetStrategy() *v1alpha1.SyncStrategy {
 	return nil
 }
 
-func (m *ApplicationSyncRequest) GetResources() []v1alpha1.SyncOperationResource {
+func (m *ApplicationSyncRequest) GetResources() []*v1alpha1.SyncOperationResource {
 	if m != nil {
 		return m.Resources
 	}
@@ -753,12 +752,12 @@ func (m *ApplicationSyncRequest) GetSyncOptions() *SyncOptions {
 
 // ApplicationUpdateSpecRequest is a request to update application spec
 type ApplicationUpdateSpecRequest struct {
-	Name                 *string                  `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
-	Spec                 v1alpha1.ApplicationSpec `protobuf:"bytes,2,req,name=spec" json:"spec"`
-	Validate             *bool                    `protobuf:"varint,3,opt,name=validate" json:"validate,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
-	XXX_unrecognized     []byte                   `json:"-"`
-	XXX_sizecache        int32                    `json:"-"`
+	Name                 *string                   `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
+	Spec                 *v1alpha1.ApplicationSpec `protobuf:"bytes,2,req,name=spec" json:"spec,omitempty"`
+	Validate             *bool                     `protobuf:"varint,3,opt,name=validate" json:"validate,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
 }
 
 func (m *ApplicationUpdateSpecRequest) Reset()         { *m = ApplicationUpdateSpecRequest{} }
@@ -801,11 +800,11 @@ func (m *ApplicationUpdateSpecRequest) GetName() string {
 	return ""
 }
 
-func (m *ApplicationUpdateSpecRequest) GetSpec() v1alpha1.ApplicationSpec {
+func (m *ApplicationUpdateSpecRequest) GetSpec() *v1alpha1.ApplicationSpec {
 	if m != nil {
 		return m.Spec
 	}
-	return v1alpha1.ApplicationSpec{}
+	return nil
 }
 
 func (m *ApplicationUpdateSpecRequest) GetValidate() bool {
@@ -818,8 +817,8 @@ func (m *ApplicationUpdateSpecRequest) GetValidate() bool {
 // ApplicationPatchRequest is a request to patch an application
 type ApplicationPatchRequest struct {
 	Name                 *string  `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
-	Patch                string   `protobuf:"bytes,2,req,name=patch" json:"patch"`
-	PatchType            string   `protobuf:"bytes,3,req,name=patchType" json:"patchType"`
+	Patch                *string  `protobuf:"bytes,2,req,name=patch" json:"patch,omitempty"`
+	PatchType            *string  `protobuf:"bytes,3,req,name=patchType" json:"patchType,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -866,24 +865,24 @@ func (m *ApplicationPatchRequest) GetName() string {
 }
 
 func (m *ApplicationPatchRequest) GetPatch() string {
-	if m != nil {
-		return m.Patch
+	if m != nil && m.Patch != nil {
+		return *m.Patch
 	}
 	return ""
 }
 
 func (m *ApplicationPatchRequest) GetPatchType() string {
-	if m != nil {
-		return m.PatchType
+	if m != nil && m.PatchType != nil {
+		return *m.PatchType
 	}
 	return ""
 }
 
 type ApplicationRollbackRequest struct {
 	Name                 *string  `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
-	ID                   int64    `protobuf:"varint,2,req,name=id" json:"id"`
-	DryRun               bool     `protobuf:"varint,3,opt,name=dryRun" json:"dryRun"`
-	Prune                bool     `protobuf:"varint,4,opt,name=prune" json:"prune"`
+	Id                   *int64   `protobuf:"varint,2,req,name=id" json:"id,omitempty"`
+	DryRun               *bool    `protobuf:"varint,3,opt,name=dryRun" json:"dryRun,omitempty"`
+	Prune                *bool    `protobuf:"varint,4,opt,name=prune" json:"prune,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -929,34 +928,34 @@ func (m *ApplicationRollbackRequest) GetName() string {
 	return ""
 }
 
-func (m *ApplicationRollbackRequest) GetID() int64 {
-	if m != nil {
-		return m.ID
+func (m *ApplicationRollbackRequest) GetId() int64 {
+	if m != nil && m.Id != nil {
+		return *m.Id
 	}
 	return 0
 }
 
 func (m *ApplicationRollbackRequest) GetDryRun() bool {
-	if m != nil {
-		return m.DryRun
+	if m != nil && m.DryRun != nil {
+		return *m.DryRun
 	}
 	return false
 }
 
 func (m *ApplicationRollbackRequest) GetPrune() bool {
-	if m != nil {
-		return m.Prune
+	if m != nil && m.Prune != nil {
+		return *m.Prune
 	}
 	return false
 }
 
 type ApplicationResourceRequest struct {
 	Name                 *string  `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
-	Namespace            string   `protobuf:"bytes,2,req,name=namespace" json:"namespace"`
-	ResourceName         string   `protobuf:"bytes,3,req,name=resourceName" json:"resourceName"`
-	Version              string   `protobuf:"bytes,4,req,name=version" json:"version"`
-	Group                string   `protobuf:"bytes,5,req,name=group" json:"group"`
-	Kind                 string   `protobuf:"bytes,6,req,name=kind" json:"kind"`
+	Namespace            *string  `protobuf:"bytes,2,req,name=namespace" json:"namespace,omitempty"`
+	ResourceName         *string  `protobuf:"bytes,3,req,name=resourceName" json:"resourceName,omitempty"`
+	Version              *string  `protobuf:"bytes,4,req,name=version" json:"version,omitempty"`
+	Group                *string  `protobuf:"bytes,5,req,name=group" json:"group,omitempty"`
+	Kind                 *string  `protobuf:"bytes,6,req,name=kind" json:"kind,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1003,49 +1002,49 @@ func (m *ApplicationResourceRequest) GetName() string {
 }
 
 func (m *ApplicationResourceRequest) GetNamespace() string {
-	if m != nil {
-		return m.Namespace
+	if m != nil && m.Namespace != nil {
+		return *m.Namespace
 	}
 	return ""
 }
 
 func (m *ApplicationResourceRequest) GetResourceName() string {
-	if m != nil {
-		return m.ResourceName
+	if m != nil && m.ResourceName != nil {
+		return *m.ResourceName
 	}
 	return ""
 }
 
 func (m *ApplicationResourceRequest) GetVersion() string {
-	if m != nil {
-		return m.Version
+	if m != nil && m.Version != nil {
+		return *m.Version
 	}
 	return ""
 }
 
 func (m *ApplicationResourceRequest) GetGroup() string {
-	if m != nil {
-		return m.Group
+	if m != nil && m.Group != nil {
+		return *m.Group
 	}
 	return ""
 }
 
 func (m *ApplicationResourceRequest) GetKind() string {
-	if m != nil {
-		return m.Kind
+	if m != nil && m.Kind != nil {
+		return *m.Kind
 	}
 	return ""
 }
 
 type ApplicationResourcePatchRequest struct {
 	Name                 *string  `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
-	Namespace            string   `protobuf:"bytes,2,req,name=namespace" json:"namespace"`
-	ResourceName         string   `protobuf:"bytes,3,req,name=resourceName" json:"resourceName"`
-	Version              string   `protobuf:"bytes,4,req,name=version" json:"version"`
-	Group                string   `protobuf:"bytes,5,req,name=group" json:"group"`
-	Kind                 string   `protobuf:"bytes,6,req,name=kind" json:"kind"`
-	Patch                string   `protobuf:"bytes,7,req,name=patch" json:"patch"`
-	PatchType            string   `protobuf:"bytes,8,req,name=patchType" json:"patchType"`
+	Namespace            *string  `protobuf:"bytes,2,req,name=namespace" json:"namespace,omitempty"`
+	ResourceName         *string  `protobuf:"bytes,3,req,name=resourceName" json:"resourceName,omitempty"`
+	Version              *string  `protobuf:"bytes,4,req,name=version" json:"version,omitempty"`
+	Group                *string  `protobuf:"bytes,5,req,name=group" json:"group,omitempty"`
+	Kind                 *string  `protobuf:"bytes,6,req,name=kind" json:"kind,omitempty"`
+	Patch                *string  `protobuf:"bytes,7,req,name=patch" json:"patch,omitempty"`
+	PatchType            *string  `protobuf:"bytes,8,req,name=patchType" json:"patchType,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1092,61 +1091,61 @@ func (m *ApplicationResourcePatchRequest) GetName() string {
 }
 
 func (m *ApplicationResourcePatchRequest) GetNamespace() string {
-	if m != nil {
-		return m.Namespace
+	if m != nil && m.Namespace != nil {
+		return *m.Namespace
 	}
 	return ""
 }
 
 func (m *ApplicationResourcePatchRequest) GetResourceName() string {
-	if m != nil {
-		return m.ResourceName
+	if m != nil && m.ResourceName != nil {
+		return *m.ResourceName
 	}
 	return ""
 }
 
 func (m *ApplicationResourcePatchRequest) GetVersion() string {
-	if m != nil {
-		return m.Version
+	if m != nil && m.Version != nil {
+		return *m.Version
 	}
 	return ""
 }
 
 func (m *ApplicationResourcePatchRequest) GetGroup() string {
-	if m != nil {
-		return m.Group
+	if m != nil && m.Group != nil {
+		return *m.Group
 	}
 	return ""
 }
 
 func (m *ApplicationResourcePatchRequest) GetKind() string {
-	if m != nil {
-		return m.Kind
+	if m != nil && m.Kind != nil {
+		return *m.Kind
 	}
 	return ""
 }
 
 func (m *ApplicationResourcePatchRequest) GetPatch() string {
-	if m != nil {
-		return m.Patch
+	if m != nil && m.Patch != nil {
+		return *m.Patch
 	}
 	return ""
 }
 
 func (m *ApplicationResourcePatchRequest) GetPatchType() string {
-	if m != nil {
-		return m.PatchType
+	if m != nil && m.PatchType != nil {
+		return *m.PatchType
 	}
 	return ""
 }
 
 type ApplicationResourceDeleteRequest struct {
 	Name                 *string  `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
-	Namespace            string   `protobuf:"bytes,2,req,name=namespace" json:"namespace"`
-	ResourceName         string   `protobuf:"bytes,3,req,name=resourceName" json:"resourceName"`
-	Version              string   `protobuf:"bytes,4,req,name=version" json:"version"`
-	Group                string   `protobuf:"bytes,5,req,name=group" json:"group"`
-	Kind                 string   `protobuf:"bytes,6,req,name=kind" json:"kind"`
+	Namespace            *string  `protobuf:"bytes,2,req,name=namespace" json:"namespace,omitempty"`
+	ResourceName         *string  `protobuf:"bytes,3,req,name=resourceName" json:"resourceName,omitempty"`
+	Version              *string  `protobuf:"bytes,4,req,name=version" json:"version,omitempty"`
+	Group                *string  `protobuf:"bytes,5,req,name=group" json:"group,omitempty"`
+	Kind                 *string  `protobuf:"bytes,6,req,name=kind" json:"kind,omitempty"`
 	Force                *bool    `protobuf:"varint,7,opt,name=force" json:"force,omitempty"`
 	Orphan               *bool    `protobuf:"varint,8,opt,name=orphan" json:"orphan,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -1195,36 +1194,36 @@ func (m *ApplicationResourceDeleteRequest) GetName() string {
 }
 
 func (m *ApplicationResourceDeleteRequest) GetNamespace() string {
-	if m != nil {
-		return m.Namespace
+	if m != nil && m.Namespace != nil {
+		return *m.Namespace
 	}
 	return ""
 }
 
 func (m *ApplicationResourceDeleteRequest) GetResourceName() string {
-	if m != nil {
-		return m.ResourceName
+	if m != nil && m.ResourceName != nil {
+		return *m.ResourceName
 	}
 	return ""
 }
 
 func (m *ApplicationResourceDeleteRequest) GetVersion() string {
-	if m != nil {
-		return m.Version
+	if m != nil && m.Version != nil {
+		return *m.Version
 	}
 	return ""
 }
 
 func (m *ApplicationResourceDeleteRequest) GetGroup() string {
-	if m != nil {
-		return m.Group
+	if m != nil && m.Group != nil {
+		return *m.Group
 	}
 	return ""
 }
 
 func (m *ApplicationResourceDeleteRequest) GetKind() string {
-	if m != nil {
-		return m.Kind
+	if m != nil && m.Kind != nil {
+		return *m.Kind
 	}
 	return ""
 }
@@ -1245,12 +1244,12 @@ func (m *ApplicationResourceDeleteRequest) GetOrphan() bool {
 
 type ResourceActionRunRequest struct {
 	Name                 *string  `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
-	Namespace            string   `protobuf:"bytes,2,req,name=namespace" json:"namespace"`
-	ResourceName         string   `protobuf:"bytes,3,req,name=resourceName" json:"resourceName"`
-	Version              string   `protobuf:"bytes,4,req,name=version" json:"version"`
-	Group                string   `protobuf:"bytes,5,req,name=group" json:"group"`
-	Kind                 string   `protobuf:"bytes,6,req,name=kind" json:"kind"`
-	Action               string   `protobuf:"bytes,7,req,name=action" json:"action"`
+	Namespace            *string  `protobuf:"bytes,2,req,name=namespace" json:"namespace,omitempty"`
+	ResourceName         *string  `protobuf:"bytes,3,req,name=resourceName" json:"resourceName,omitempty"`
+	Version              *string  `protobuf:"bytes,4,req,name=version" json:"version,omitempty"`
+	Group                *string  `protobuf:"bytes,5,req,name=group" json:"group,omitempty"`
+	Kind                 *string  `protobuf:"bytes,6,req,name=kind" json:"kind,omitempty"`
+	Action               *string  `protobuf:"bytes,7,req,name=action" json:"action,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1297,52 +1296,52 @@ func (m *ResourceActionRunRequest) GetName() string {
 }
 
 func (m *ResourceActionRunRequest) GetNamespace() string {
-	if m != nil {
-		return m.Namespace
+	if m != nil && m.Namespace != nil {
+		return *m.Namespace
 	}
 	return ""
 }
 
 func (m *ResourceActionRunRequest) GetResourceName() string {
-	if m != nil {
-		return m.ResourceName
+	if m != nil && m.ResourceName != nil {
+		return *m.ResourceName
 	}
 	return ""
 }
 
 func (m *ResourceActionRunRequest) GetVersion() string {
-	if m != nil {
-		return m.Version
+	if m != nil && m.Version != nil {
+		return *m.Version
 	}
 	return ""
 }
 
 func (m *ResourceActionRunRequest) GetGroup() string {
-	if m != nil {
-		return m.Group
+	if m != nil && m.Group != nil {
+		return *m.Group
 	}
 	return ""
 }
 
 func (m *ResourceActionRunRequest) GetKind() string {
-	if m != nil {
-		return m.Kind
+	if m != nil && m.Kind != nil {
+		return *m.Kind
 	}
 	return ""
 }
 
 func (m *ResourceActionRunRequest) GetAction() string {
-	if m != nil {
-		return m.Action
+	if m != nil && m.Action != nil {
+		return *m.Action
 	}
 	return ""
 }
 
 type ResourceActionsListResponse struct {
-	Actions              []v1alpha1.ResourceAction `protobuf:"bytes,1,rep,name=actions" json:"actions"`
-	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
-	XXX_unrecognized     []byte                    `json:"-"`
-	XXX_sizecache        int32                     `json:"-"`
+	Actions              []*v1alpha1.ResourceAction `protobuf:"bytes,1,rep,name=actions" json:"actions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
 }
 
 func (m *ResourceActionsListResponse) Reset()         { *m = ResourceActionsListResponse{} }
@@ -1378,7 +1377,7 @@ func (m *ResourceActionsListResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ResourceActionsListResponse proto.InternalMessageInfo
 
-func (m *ResourceActionsListResponse) GetActions() []v1alpha1.ResourceAction {
+func (m *ResourceActionsListResponse) GetActions() []*v1alpha1.ResourceAction {
 	if m != nil {
 		return m.Actions
 	}
@@ -1386,7 +1385,7 @@ func (m *ResourceActionsListResponse) GetActions() []v1alpha1.ResourceAction {
 }
 
 type ApplicationResourceResponse struct {
-	Manifest             string   `protobuf:"bytes,1,req,name=manifest" json:"manifest"`
+	Manifest             *string  `protobuf:"bytes,1,req,name=manifest" json:"manifest,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1426,27 +1425,27 @@ func (m *ApplicationResourceResponse) XXX_DiscardUnknown() {
 var xxx_messageInfo_ApplicationResourceResponse proto.InternalMessageInfo
 
 func (m *ApplicationResourceResponse) GetManifest() string {
-	if m != nil {
-		return m.Manifest
+	if m != nil && m.Manifest != nil {
+		return *m.Manifest
 	}
 	return ""
 }
 
 type ApplicationPodLogsQuery struct {
 	Name                 *string  `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
-	Namespace            string   `protobuf:"bytes,2,req,name=namespace" json:"namespace"`
+	Namespace            *string  `protobuf:"bytes,2,req,name=namespace" json:"namespace,omitempty"`
 	PodName              *string  `protobuf:"bytes,3,opt,name=podName" json:"podName,omitempty"`
-	Container            string   `protobuf:"bytes,4,req,name=container" json:"container"`
-	SinceSeconds         int64    `protobuf:"varint,5,req,name=sinceSeconds" json:"sinceSeconds"`
+	Container            *string  `protobuf:"bytes,4,req,name=container" json:"container,omitempty"`
+	SinceSeconds         *int64   `protobuf:"varint,5,req,name=sinceSeconds" json:"sinceSeconds,omitempty"`
 	SinceTime            *v1.Time `protobuf:"bytes,6,opt,name=sinceTime" json:"sinceTime,omitempty"`
-	TailLines            int64    `protobuf:"varint,7,req,name=tailLines" json:"tailLines"`
-	Follow               bool     `protobuf:"varint,8,req,name=follow" json:"follow"`
+	TailLines            *int64   `protobuf:"varint,7,req,name=tailLines" json:"tailLines,omitempty"`
+	Follow               *bool    `protobuf:"varint,8,req,name=follow" json:"follow,omitempty"`
 	UntilTime            *string  `protobuf:"bytes,9,opt,name=untilTime" json:"untilTime,omitempty"`
 	Filter               *string  `protobuf:"bytes,10,opt,name=filter" json:"filter,omitempty"`
 	Kind                 *string  `protobuf:"bytes,11,opt,name=kind" json:"kind,omitempty"`
 	Group                *string  `protobuf:"bytes,12,opt,name=group" json:"group,omitempty"`
 	ResourceName         *string  `protobuf:"bytes,13,opt,name=resourceName" json:"resourceName,omitempty"`
-	Previous             bool     `protobuf:"varint,14,opt,name=previous" json:"previous"`
+	Previous             *bool    `protobuf:"varint,14,opt,name=previous" json:"previous,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1493,8 +1492,8 @@ func (m *ApplicationPodLogsQuery) GetName() string {
 }
 
 func (m *ApplicationPodLogsQuery) GetNamespace() string {
-	if m != nil {
-		return m.Namespace
+	if m != nil && m.Namespace != nil {
+		return *m.Namespace
 	}
 	return ""
 }
@@ -1507,15 +1506,15 @@ func (m *ApplicationPodLogsQuery) GetPodName() string {
 }
 
 func (m *ApplicationPodLogsQuery) GetContainer() string {
-	if m != nil {
-		return m.Container
+	if m != nil && m.Container != nil {
+		return *m.Container
 	}
 	return ""
 }
 
 func (m *ApplicationPodLogsQuery) GetSinceSeconds() int64 {
-	if m != nil {
-		return m.SinceSeconds
+	if m != nil && m.SinceSeconds != nil {
+		return *m.SinceSeconds
 	}
 	return 0
 }
@@ -1528,15 +1527,15 @@ func (m *ApplicationPodLogsQuery) GetSinceTime() *v1.Time {
 }
 
 func (m *ApplicationPodLogsQuery) GetTailLines() int64 {
-	if m != nil {
-		return m.TailLines
+	if m != nil && m.TailLines != nil {
+		return *m.TailLines
 	}
 	return 0
 }
 
 func (m *ApplicationPodLogsQuery) GetFollow() bool {
-	if m != nil {
-		return m.Follow
+	if m != nil && m.Follow != nil {
+		return *m.Follow
 	}
 	return false
 }
@@ -1577,19 +1576,19 @@ func (m *ApplicationPodLogsQuery) GetResourceName() string {
 }
 
 func (m *ApplicationPodLogsQuery) GetPrevious() bool {
-	if m != nil {
-		return m.Previous
+	if m != nil && m.Previous != nil {
+		return *m.Previous
 	}
 	return false
 }
 
 type LogEntry struct {
-	Content string `protobuf:"bytes,1,req,name=content" json:"content"`
+	Content *string `protobuf:"bytes,1,req,name=content" json:"content,omitempty"`
 	// deprecated in favor of timeStampStr since meta.v1.Time don't support nano time
-	TimeStamp            v1.Time  `protobuf:"bytes,2,req,name=timeStamp" json:"timeStamp"` // Deprecated: Do not use.
-	Last                 bool     `protobuf:"varint,3,req,name=last" json:"last"`
-	TimeStampStr         string   `protobuf:"bytes,4,req,name=timeStampStr" json:"timeStampStr"`
-	PodName              string   `protobuf:"bytes,5,req,name=podName" json:"podName"`
+	TimeStamp            *v1.Time `protobuf:"bytes,2,req,name=timeStamp" json:"timeStamp,omitempty"`
+	Last                 *bool    `protobuf:"varint,3,req,name=last" json:"last,omitempty"`
+	TimeStampStr         *string  `protobuf:"bytes,4,req,name=timeStampStr" json:"timeStampStr,omitempty"`
+	PodName              *string  `protobuf:"bytes,5,req,name=podName" json:"podName,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1629,37 +1628,36 @@ func (m *LogEntry) XXX_DiscardUnknown() {
 var xxx_messageInfo_LogEntry proto.InternalMessageInfo
 
 func (m *LogEntry) GetContent() string {
-	if m != nil {
-		return m.Content
+	if m != nil && m.Content != nil {
+		return *m.Content
 	}
 	return ""
 }
 
-// Deprecated: Do not use.
-func (m *LogEntry) GetTimeStamp() v1.Time {
+func (m *LogEntry) GetTimeStamp() *v1.Time {
 	if m != nil {
 		return m.TimeStamp
 	}
-	return v1.Time{}
+	return nil
 }
 
 func (m *LogEntry) GetLast() bool {
-	if m != nil {
-		return m.Last
+	if m != nil && m.Last != nil {
+		return *m.Last
 	}
 	return false
 }
 
 func (m *LogEntry) GetTimeStampStr() string {
-	if m != nil {
-		return m.TimeStampStr
+	if m != nil && m.TimeStampStr != nil {
+		return *m.TimeStampStr
 	}
 	return ""
 }
 
 func (m *LogEntry) GetPodName() string {
-	if m != nil {
-		return m.PodName
+	if m != nil && m.PodName != nil {
+		return *m.PodName
 	}
 	return ""
 }
@@ -1933,11 +1931,11 @@ var xxx_messageInfo_OperationTerminateResponse proto.InternalMessageInfo
 
 type ResourcesQuery struct {
 	ApplicationName      *string  `protobuf:"bytes,1,req,name=applicationName" json:"applicationName,omitempty"`
-	Namespace            string   `protobuf:"bytes,2,opt,name=namespace" json:"namespace"`
-	Name                 string   `protobuf:"bytes,3,opt,name=name" json:"name"`
-	Version              string   `protobuf:"bytes,4,opt,name=version" json:"version"`
-	Group                string   `protobuf:"bytes,5,opt,name=group" json:"group"`
-	Kind                 string   `protobuf:"bytes,6,opt,name=kind" json:"kind"`
+	Namespace            *string  `protobuf:"bytes,2,opt,name=namespace" json:"namespace,omitempty"`
+	Name                 *string  `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
+	Version              *string  `protobuf:"bytes,4,opt,name=version" json:"version,omitempty"`
+	Group                *string  `protobuf:"bytes,5,opt,name=group" json:"group,omitempty"`
+	Kind                 *string  `protobuf:"bytes,6,opt,name=kind" json:"kind,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1984,36 +1982,36 @@ func (m *ResourcesQuery) GetApplicationName() string {
 }
 
 func (m *ResourcesQuery) GetNamespace() string {
-	if m != nil {
-		return m.Namespace
+	if m != nil && m.Namespace != nil {
+		return *m.Namespace
 	}
 	return ""
 }
 
 func (m *ResourcesQuery) GetName() string {
-	if m != nil {
-		return m.Name
+	if m != nil && m.Name != nil {
+		return *m.Name
 	}
 	return ""
 }
 
 func (m *ResourcesQuery) GetVersion() string {
-	if m != nil {
-		return m.Version
+	if m != nil && m.Version != nil {
+		return *m.Version
 	}
 	return ""
 }
 
 func (m *ResourcesQuery) GetGroup() string {
-	if m != nil {
-		return m.Group
+	if m != nil && m.Group != nil {
+		return *m.Group
 	}
 	return ""
 }
 
 func (m *ResourcesQuery) GetKind() string {
-	if m != nil {
-		return m.Kind
+	if m != nil && m.Kind != nil {
+		return *m.Kind
 	}
 	return ""
 }
@@ -2102,154 +2100,148 @@ func init() {
 }
 
 var fileDescriptor_df6e82b174b5eaec = []byte{
-	// 2343 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xcd, 0x6f, 0x1c, 0x49,
-	0x15, 0xa7, 0xc6, 0x5f, 0x33, 0x6f, 0xf2, 0x59, 0x9b, 0x84, 0xde, 0x89, 0xe3, 0x8c, 0x2a, 0x5f,
-	0x8e, 0x13, 0xf7, 0x24, 0x43, 0x84, 0x82, 0x17, 0xb4, 0xc4, 0x9b, 0x90, 0x0d, 0x38, 0x59, 0xd3,
-	0x4e, 0x08, 0x5a, 0x0e, 0xd0, 0xdb, 0x5d, 0x1e, 0x37, 0x9e, 0xe9, 0xea, 0x74, 0xf7, 0x4c, 0x34,
-	0x0a, 0xb9, 0x2c, 0x12, 0x17, 0x10, 0x20, 0xc8, 0x01, 0x10, 0x42, 0x88, 0xd5, 0x9e, 0xb9, 0x01,
-	0xe2, 0xb6, 0x17, 0xb4, 0xdc, 0x10, 0xec, 0x39, 0x5a, 0x2c, 0x6e, 0x5c, 0xf8, 0x13, 0x50, 0x55,
-	0x57, 0x75, 0x57, 0x8f, 0x67, 0x7a, 0x9c, 0xf5, 0xac, 0x56, 0xb9, 0x4d, 0xbd, 0xaa, 0x7e, 0xef,
-	0xf7, 0xbe, 0xab, 0x9e, 0x0d, 0x67, 0x23, 0x1a, 0xf6, 0x68, 0xd8, 0xb0, 0x83, 0xa0, 0xed, 0x39,
-	0x76, 0xec, 0x31, 0x5f, 0xff, 0x6d, 0x06, 0x21, 0x8b, 0x19, 0xae, 0x6a, 0xa4, 0xda, 0xb1, 0x16,
-	0x6b, 0x31, 0x41, 0x6f, 0xf0, 0x5f, 0xc9, 0x91, 0xda, 0x7c, 0x8b, 0xb1, 0x56, 0x9b, 0x36, 0xec,
-	0xc0, 0x6b, 0xd8, 0xbe, 0xcf, 0x62, 0x71, 0x38, 0x92, 0xbb, 0x64, 0xfb, 0x7a, 0x64, 0x7a, 0x4c,
-	0xec, 0x3a, 0x2c, 0xa4, 0x8d, 0xde, 0xd5, 0x46, 0x8b, 0xfa, 0x34, 0xb4, 0x63, 0xea, 0xca, 0x33,
-	0xd7, 0xb2, 0x33, 0x1d, 0xdb, 0xd9, 0xf2, 0x7c, 0x1a, 0xf6, 0x1b, 0xc1, 0x76, 0x8b, 0x13, 0xa2,
-	0x46, 0x87, 0xc6, 0xf6, 0xb0, 0xaf, 0xd6, 0x5a, 0x5e, 0xbc, 0xd5, 0x7d, 0xc7, 0x74, 0x58, 0xa7,
-	0x61, 0x87, 0x02, 0xd8, 0xf7, 0xc5, 0x8f, 0x65, 0xc7, 0x6d, 0xf4, 0x9a, 0x19, 0x03, 0x5d, 0xc3,
-	0xde, 0x55, 0xbb, 0x1d, 0x6c, 0xd9, 0xbb, 0xb9, 0xdd, 0x1a, 0xc3, 0x2d, 0xa4, 0x01, 0x93, 0x16,
-	0x13, 0x3f, 0xbd, 0x98, 0x85, 0x7d, 0xed, 0x67, 0xc2, 0x86, 0x7c, 0x84, 0xe0, 0xc8, 0x8d, 0x4c,
-	0xde, 0x37, 0xbb, 0x34, 0xec, 0x63, 0x0c, 0xd3, 0xbe, 0xdd, 0xa1, 0x06, 0xaa, 0xa3, 0xc5, 0x8a,
-	0x25, 0x7e, 0x63, 0x03, 0xe6, 0x42, 0xba, 0x19, 0xd2, 0x68, 0xcb, 0x28, 0x09, 0xb2, 0x5a, 0xe2,
-	0xf3, 0x30, 0xc7, 0x85, 0x53, 0x27, 0x36, 0xa6, 0xea, 0x53, 0x8b, 0x95, 0xd5, 0x03, 0x3b, 0xcf,
-	0x4f, 0x97, 0xd7, 0x13, 0x52, 0x64, 0xa9, 0x4d, 0x6c, 0xc2, 0xe1, 0x90, 0x46, 0xac, 0x1b, 0x3a,
-	0xf4, 0x5b, 0x34, 0x8c, 0x3c, 0xe6, 0x1b, 0xd3, 0x9c, 0xd3, 0xea, 0xf4, 0x87, 0xcf, 0x4f, 0x7f,
-	0xce, 0x1a, 0xdc, 0xc4, 0x75, 0x28, 0x47, 0xb4, 0x4d, 0x9d, 0x98, 0x85, 0xc6, 0x8c, 0x76, 0x30,
-	0xa5, 0x62, 0x03, 0xa6, 0xb9, 0x42, 0xc6, 0xac, 0xb6, 0x2b, 0x28, 0xe4, 0x34, 0x54, 0xee, 0x31,
-	0x97, 0x8e, 0x54, 0x87, 0xdc, 0x86, 0xe3, 0x16, 0xed, 0x79, 0x5c, 0xd0, 0x5d, 0x1a, 0xdb, 0xae,
-	0x1d, 0xdb, 0x83, 0x87, 0x4b, 0xa9, 0xee, 0x35, 0x28, 0x87, 0xf2, 0xb0, 0x51, 0x12, 0xf4, 0x74,
-	0x4d, 0xfe, 0x8a, 0x60, 0x41, 0x33, 0xa0, 0x25, 0x95, 0xb8, 0xd5, 0xa3, 0x7e, 0x1c, 0x8d, 0x66,
-	0xd9, 0x84, 0xa3, 0x4a, 0xdf, 0x7b, 0x76, 0x87, 0x46, 0x81, 0xed, 0xd0, 0x84, 0xb7, 0xd4, 0x63,
-	0xf7, 0x36, 0x5e, 0x84, 0x03, 0x3a, 0xd1, 0x98, 0xd2, 0x8e, 0xe7, 0x76, 0xf0, 0x79, 0xa8, 0xaa,
-	0xf5, 0x83, 0x3b, 0x37, 0x8d, 0x69, 0xed, 0xa0, 0xbe, 0x41, 0xd6, 0xc1, 0xd0, 0xb0, 0xdf, 0xb5,
-	0x7d, 0x6f, 0x93, 0x46, 0xf1, 0x68, 0xd4, 0xf5, 0x9c, 0x21, 0x34, 0x97, 0xa4, 0xe6, 0x38, 0x0e,
-	0xaf, 0xe4, 0xad, 0x11, 0x30, 0x3f, 0xa2, 0xe4, 0x03, 0x94, 0x93, 0xf4, 0x46, 0x48, 0xed, 0x98,
-	0x5a, 0xf4, 0x51, 0x97, 0x46, 0x31, 0x7e, 0x04, 0x7a, 0xd6, 0x0a, 0x81, 0xd5, 0xe6, 0x1d, 0x33,
-	0x0b, 0x70, 0x53, 0x05, 0xb8, 0xf8, 0xf1, 0x5d, 0xc7, 0x35, 0x7b, 0x4d, 0x33, 0xd8, 0x6e, 0x99,
-	0x3c, 0x5d, 0x4c, 0xbd, 0x08, 0xa8, 0x74, 0x31, 0x35, 0x61, 0x4a, 0x71, 0xed, 0x1c, 0x3e, 0x01,
-	0xb3, 0xdd, 0x20, 0xa2, 0x61, 0x2c, 0xd4, 0x28, 0x5b, 0x72, 0xc5, 0x3d, 0xdd, 0xb3, 0xdb, 0x9e,
-	0x6b, 0xc7, 0xdc, 0xbc, 0x7c, 0x27, 0x5d, 0x93, 0xf7, 0xf2, 0x3a, 0x3c, 0x08, 0x5c, 0x4d, 0x87,
-	0xed, 0x4f, 0x57, 0x87, 0x3c, 0x7a, 0x1d, 0x65, 0x69, 0x00, 0x65, 0x2f, 0x07, 0xf2, 0x26, 0x6d,
-	0xd3, 0x0c, 0xe4, 0x30, 0x97, 0x1a, 0x30, 0xe7, 0xd8, 0x91, 0x63, 0xbb, 0x8a, 0x95, 0x5a, 0xe2,
-	0xcb, 0x70, 0x34, 0x08, 0x59, 0x60, 0xb7, 0x04, 0xa7, 0x75, 0xd6, 0xf6, 0x9c, 0xbe, 0x30, 0x4a,
-	0xc5, 0xda, 0xbd, 0x41, 0xce, 0x40, 0x75, 0xa3, 0xef, 0x3b, 0x6f, 0x05, 0xa2, 0x98, 0xe2, 0x63,
-	0x30, 0xe3, 0xc5, 0xb4, 0x13, 0x19, 0x88, 0x97, 0x04, 0x2b, 0x59, 0x90, 0x9f, 0xcf, 0xc0, 0x09,
-	0x0d, 0x1d, 0xff, 0xa0, 0x08, 0xdb, 0xd8, 0x70, 0xc3, 0xf3, 0x30, 0xeb, 0x86, 0x7d, 0xab, 0xeb,
-	0x27, 0xde, 0x92, 0xfb, 0x92, 0x86, 0x6b, 0x30, 0x13, 0x84, 0x5d, 0x9f, 0x8a, 0x3a, 0xa3, 0x36,
-	0x13, 0x12, 0xde, 0x84, 0x72, 0x14, 0xf3, 0x82, 0xda, 0xea, 0x8b, 0xea, 0x52, 0x6d, 0x7e, 0x7d,
-	0x7f, 0xde, 0xe2, 0xca, 0x6c, 0x48, 0x8e, 0x56, 0xca, 0x1b, 0x3f, 0x86, 0x8a, 0xca, 0xb8, 0xc8,
-	0x98, 0xab, 0x4f, 0x2d, 0x56, 0x9b, 0x1b, 0xfb, 0x17, 0xf4, 0x56, 0xc0, 0x9b, 0x81, 0x56, 0x6f,
-	0xa4, 0x72, 0x99, 0x2c, 0x3c, 0x0f, 0x95, 0x8e, 0x4c, 0xe8, 0xc8, 0x28, 0x0b, 0x2f, 0x64, 0x04,
-	0xfc, 0x6d, 0x98, 0xf1, 0xfc, 0x4d, 0x16, 0x19, 0x15, 0x01, 0x69, 0x75, 0x7f, 0x90, 0xee, 0xf8,
-	0x9b, 0xcc, 0x4a, 0x18, 0xe2, 0x47, 0x70, 0x30, 0xa4, 0x71, 0xd8, 0x57, 0xb6, 0x30, 0x40, 0x58,
-	0xf7, 0x1b, 0xfb, 0x93, 0x60, 0xe9, 0x2c, 0xad, 0xbc, 0x04, 0xbc, 0x02, 0xd5, 0x28, 0x8b, 0x3d,
-	0xa3, 0x2a, 0x04, 0x1a, 0x39, 0x46, 0x5a, 0x6c, 0x5a, 0xfa, 0x61, 0xf2, 0x67, 0x04, 0xf3, 0xbb,
-	0xb2, 0x7a, 0x23, 0xa0, 0x85, 0x81, 0xd9, 0x82, 0xe9, 0x28, 0xa0, 0x8e, 0x28, 0xd8, 0xd5, 0xe6,
-	0xdd, 0x89, 0xa5, 0x39, 0x97, 0xab, 0xfa, 0x18, 0x17, 0x50, 0x58, 0x8f, 0x3a, 0xf0, 0x79, 0xed,
-	0xd3, 0x75, 0x3b, 0x76, 0xb6, 0x8a, 0x30, 0xf3, 0x64, 0xe0, 0x67, 0x72, 0x5d, 0x26, 0x21, 0x61,
-	0x02, 0x15, 0xf1, 0xe3, 0x7e, 0x3f, 0xc8, 0xb7, 0x95, 0x8c, 0x4c, 0x7e, 0x84, 0xa0, 0xa6, 0x57,
-	0x24, 0xd6, 0x6e, 0xbf, 0x63, 0x3b, 0xdb, 0xc5, 0x22, 0x4b, 0x9e, 0x2b, 0xe4, 0x4d, 0xad, 0x02,
-	0xe7, 0xb7, 0xf3, 0xfc, 0x74, 0xe9, 0xce, 0x4d, 0xab, 0xe4, 0xb9, 0x9f, 0x3c, 0x73, 0xf9, 0x95,
-	0xa5, 0x36, 0xa4, 0xe3, 0x16, 0x01, 0x21, 0x50, 0xf1, 0x87, 0x76, 0xd9, 0x8c, 0xfc, 0x02, 0xdd,
-	0x75, 0x01, 0xe6, 0x7a, 0xe9, 0x05, 0x26, 0x3b, 0xa4, 0x88, 0x1c, 0x7c, 0x2b, 0x64, 0xdd, 0xc0,
-	0x98, 0xd1, 0x2d, 0x2d, 0x48, 0xfc, 0xca, 0xb2, 0xed, 0xf9, 0xae, 0x31, 0xab, 0x6d, 0x09, 0x0a,
-	0xf9, 0x75, 0x09, 0x4e, 0x0f, 0x51, 0x6b, 0xac, 0x5f, 0x5f, 0x02, 0xdd, 0xb2, 0xd8, 0x9b, 0x1b,
-	0x13, 0x7b, 0xe5, 0xe1, 0xb1, 0xf7, 0xac, 0x04, 0xf5, 0x21, 0xb6, 0x19, 0xdf, 0xdd, 0x5e, 0x12,
-	0xe3, 0x6c, 0xb2, 0xd0, 0xa1, 0xc6, 0x5c, 0x1a, 0xeb, 0xc8, 0x4a, 0x48, 0x3c, 0x4b, 0x58, 0x18,
-	0x6c, 0xd9, 0xbe, 0x51, 0xd6, 0x36, 0x25, 0x8d, 0xfc, 0x0f, 0x81, 0xa1, 0x6c, 0x71, 0xc3, 0x11,
-	0x96, 0xe9, 0xfa, 0x2f, 0xbb, 0x39, 0xe6, 0x61, 0xd6, 0x16, 0xba, 0xe4, 0x82, 0x45, 0xd2, 0xc8,
-	0x8f, 0x11, 0x9c, 0xcc, 0xab, 0x1c, 0xad, 0x79, 0x51, 0xac, 0x2e, 0x9a, 0xb8, 0x0d, 0x73, 0xc9,
-	0xc9, 0xe4, 0xe6, 0x51, 0x6d, 0xae, 0xed, 0xb7, 0xef, 0xe8, 0xb2, 0x94, 0x86, 0x52, 0x04, 0x79,
-	0x1d, 0x4e, 0x0e, 0xad, 0x44, 0x12, 0x4c, 0x1d, 0xca, 0xaa, 0xe3, 0x26, 0x6e, 0x50, 0xf7, 0x17,
-	0x45, 0x25, 0xff, 0x9d, 0xca, 0x17, 0x71, 0xe6, 0xae, 0xb1, 0x56, 0xc1, 0xb3, 0x61, 0x2f, 0x0e,
-	0x34, 0x60, 0x2e, 0x60, 0xae, 0xf4, 0x9d, 0x78, 0xa9, 0xc9, 0x25, 0xff, 0xda, 0x61, 0x7e, 0x6c,
-	0xf3, 0x07, 0x6b, 0xce, 0x65, 0x19, 0x99, 0xbb, 0x3f, 0xf2, 0x7c, 0x87, 0x6e, 0x50, 0x87, 0xf9,
-	0x6e, 0x24, 0x7c, 0x37, 0xa5, 0xdc, 0xaf, 0xef, 0xe0, 0x37, 0xa1, 0x22, 0xd6, 0xf7, 0xbd, 0x0e,
-	0x15, 0x4f, 0xb0, 0x6a, 0x73, 0xc9, 0x4c, 0x5e, 0xc6, 0xa6, 0xfe, 0x32, 0xce, 0x2c, 0xcc, 0x5f,
-	0xc6, 0x66, 0xef, 0xaa, 0xc9, 0xbf, 0xb0, 0xb2, 0x8f, 0x39, 0xae, 0xd8, 0xf6, 0xda, 0x6b, 0x9e,
-	0x2f, 0xee, 0x48, 0x99, 0xc0, 0x8c, 0xcc, 0xc3, 0x62, 0x93, 0xb5, 0xdb, 0xec, 0xb1, 0xa8, 0x11,
-	0x69, 0xbf, 0x48, 0x68, 0xfc, 0xb2, 0xd3, 0xf5, 0x63, 0xaf, 0x2d, 0xb0, 0x54, 0x84, 0xd6, 0x19,
-	0x81, 0xdf, 0xf6, 0x37, 0xbd, 0x76, 0x4c, 0x43, 0x71, 0x17, 0xa9, 0x58, 0x72, 0xc5, 0x2d, 0x2c,
-	0x82, 0xb0, 0x9a, 0x3c, 0x0c, 0x45, 0xf8, 0x1d, 0x53, 0x41, 0x7b, 0x40, 0x10, 0x65, 0xb8, 0x92,
-	0x81, 0xa4, 0x38, 0x28, 0x36, 0xf3, 0xe9, 0x50, 0x87, 0x72, 0xc0, 0x2f, 0xa6, 0xac, 0x1b, 0x19,
-	0x87, 0xb4, 0xb6, 0x95, 0x52, 0xc9, 0xc7, 0x08, 0xca, 0x6b, 0xac, 0x75, 0xcb, 0x8f, 0xc3, 0x3e,
-	0xcf, 0x1e, 0x6e, 0x75, 0xea, 0xe7, 0x63, 0x43, 0x11, 0xf1, 0x3a, 0x54, 0x62, 0xaf, 0x43, 0x37,
-	0x62, 0xbb, 0x13, 0xc8, 0x8b, 0xc6, 0x0b, 0x98, 0x77, 0x75, 0x96, 0x73, 0x33, 0x90, 0x95, 0x31,
-	0xe1, 0x39, 0xd7, 0xb6, 0xa3, 0x58, 0x64, 0xb4, 0x02, 0x27, 0x28, 0xdc, 0xe9, 0xe9, 0xb1, 0x8d,
-	0x38, 0x1f, 0x1b, 0xb9, 0x1d, 0x8e, 0x5a, 0x05, 0x97, 0x9e, 0xd5, 0x8a, 0x48, 0x1a, 0xf0, 0x6a,
-	0x7a, 0x37, 0xbd, 0x4f, 0xc3, 0x8e, 0xe7, 0xdb, 0x85, 0x15, 0x9a, 0x5c, 0xcd, 0xa5, 0x10, 0xbf,
-	0xa6, 0x3d, 0xf4, 0x7c, 0x97, 0x3d, 0x1e, 0x9d, 0x04, 0xe4, 0x9f, 0xf9, 0x27, 0xb7, 0xf6, 0x4d,
-	0x9a, 0x79, 0x6f, 0xc2, 0x41, 0x9e, 0xa3, 0x3d, 0x2a, 0x37, 0x64, 0x31, 0x20, 0xb9, 0x24, 0x1f,
-	0xca, 0xc3, 0xca, 0x7f, 0x88, 0xd7, 0xe0, 0xb0, 0x1d, 0x45, 0x5e, 0xcb, 0xa7, 0xae, 0xe2, 0x55,
-	0xda, 0x33, 0xaf, 0xc1, 0x4f, 0x93, 0xd7, 0x96, 0x38, 0x91, 0x78, 0xc1, 0x52, 0x4b, 0xf2, 0x43,
-	0x04, 0xc7, 0x87, 0x32, 0x49, 0xa3, 0x54, 0x9a, 0x40, 0xf6, 0x8c, 0x72, 0xe4, 0x6c, 0x51, 0xb7,
-	0xdb, 0xa6, 0x6a, 0x22, 0xa1, 0xd6, 0x7c, 0xcf, 0xed, 0x26, 0x1e, 0x48, 0x8a, 0xb7, 0x95, 0xae,
-	0xf1, 0x02, 0x40, 0xc7, 0xf6, 0xbb, 0x76, 0x5b, 0x40, 0x98, 0x16, 0x10, 0x34, 0x0a, 0x99, 0x87,
-	0xda, 0x30, 0xf7, 0xc9, 0x57, 0xfc, 0x47, 0x08, 0x0e, 0xa9, 0x22, 0x27, 0xfd, 0x63, 0xc2, 0x61,
-	0xcd, 0x0c, 0xf7, 0x52, 0x57, 0xc9, 0x4e, 0x35, 0xb8, 0x39, 0x58, 0xc0, 0xd0, 0xf0, 0x02, 0x96,
-	0xf8, 0x7c, 0x4a, 0x1f, 0xeb, 0xf8, 0xbb, 0x3a, 0x0e, 0x2a, 0xec, 0x38, 0x68, 0x74, 0xc7, 0x41,
-	0x03, 0x37, 0xaf, 0x1f, 0x80, 0x71, 0xd7, 0xf6, 0xed, 0x16, 0x75, 0x53, 0xe5, 0xd2, 0x40, 0xfa,
-	0x9e, 0xfe, 0x8e, 0xdd, 0xf7, 0x1b, 0x31, 0xbd, 0xb8, 0x78, 0x9b, 0x9b, 0xf2, 0x4d, 0xdc, 0xfc,
-	0xf7, 0x02, 0x60, 0xdd, 0xf1, 0x34, 0xec, 0x79, 0x0e, 0xc5, 0xbf, 0x40, 0x30, 0xcd, 0x3b, 0x1b,
-	0x3e, 0x35, 0x2a, 0xce, 0x84, 0x03, 0x6a, 0x93, 0x7b, 0x7c, 0x70, 0x69, 0x64, 0xfe, 0xdd, 0x7f,
-	0xfd, 0xe7, 0x97, 0xa5, 0x13, 0xf8, 0x98, 0x18, 0x80, 0xf6, 0xae, 0xea, 0xc3, 0xc8, 0x08, 0xff,
-	0x04, 0x01, 0x96, 0xed, 0x56, 0x9b, 0x72, 0xe1, 0x4b, 0xa3, 0x20, 0x0e, 0x99, 0x86, 0xd5, 0x4e,
-	0x69, 0x45, 0xcc, 0x74, 0x58, 0x48, 0x79, 0xc9, 0x12, 0x07, 0x04, 0x80, 0x25, 0x01, 0xe0, 0x2c,
-	0x26, 0xc3, 0x00, 0x34, 0x9e, 0xf0, 0x30, 0x78, 0xda, 0xa0, 0x89, 0xdc, 0x3f, 0x20, 0x98, 0x79,
-	0x28, 0x2e, 0x91, 0x63, 0x8c, 0xb4, 0x31, 0x31, 0x23, 0x09, 0x71, 0x02, 0x2d, 0x39, 0x23, 0x90,
-	0x9e, 0xc2, 0x27, 0x15, 0xd2, 0x28, 0x0e, 0xa9, 0xdd, 0xc9, 0x01, 0xbe, 0x82, 0xf0, 0xfb, 0x08,
-	0x66, 0x93, 0x79, 0x17, 0x3e, 0x37, 0x0a, 0x65, 0x6e, 0x1e, 0x56, 0x9b, 0xdc, 0xd8, 0x88, 0x5c,
-	0x14, 0x18, 0xcf, 0x90, 0xa1, 0xee, 0x5c, 0xc9, 0x0d, 0x95, 0x9e, 0x21, 0x98, 0xba, 0x4d, 0xc7,
-	0xc6, 0xdb, 0x04, 0xc1, 0xed, 0x32, 0xe0, 0x10, 0x57, 0xe3, 0xf7, 0x10, 0xbc, 0x7a, 0x9b, 0xc6,
-	0xc3, 0xeb, 0x3d, 0x5e, 0x1c, 0x5f, 0x84, 0x65, 0xd8, 0x5d, 0xda, 0xc3, 0xc9, 0xb4, 0xd0, 0x35,
-	0x04, 0xb2, 0x8b, 0xf8, 0x42, 0x51, 0x10, 0x46, 0x7d, 0xdf, 0x79, 0x2c, 0x71, 0xfc, 0x1d, 0xc1,
-	0x91, 0xc1, 0x79, 0x32, 0xce, 0x77, 0x88, 0xa1, 0xe3, 0xe6, 0xda, 0xbd, 0xfd, 0x16, 0x94, 0x3c,
-	0x53, 0x72, 0x43, 0x20, 0x7f, 0x0d, 0x7f, 0xa9, 0x08, 0xb9, 0x1a, 0x9f, 0x45, 0x8d, 0x27, 0xea,
-	0xe7, 0x53, 0xf1, 0x67, 0x0b, 0x01, 0xfb, 0x5d, 0x04, 0x07, 0x6e, 0xd3, 0xf8, 0x6e, 0x3a, 0x2b,
-	0x1a, 0x19, 0xb6, 0xb9, 0x81, 0x71, 0x6d, 0xde, 0xd4, 0xfe, 0xba, 0xa0, 0xb6, 0x52, 0x93, 0x2e,
-	0x0b, 0x60, 0x17, 0xf0, 0xb9, 0x22, 0x60, 0xd9, 0x7c, 0xea, 0x03, 0x04, 0xb3, 0xc9, 0x2c, 0x66,
-	0xb4, 0xf8, 0xdc, 0x04, 0x76, 0x92, 0x81, 0x79, 0x4b, 0x60, 0x7d, 0xbd, 0x76, 0x65, 0x38, 0x56,
-	0xfd, 0x7b, 0x65, 0x35, 0x53, 0x28, 0x90, 0xcf, 0xa8, 0x3f, 0x21, 0x80, 0x6c, 0x9e, 0x84, 0x2f,
-	0x16, 0xeb, 0xa1, 0xcd, 0x9c, 0x6a, 0x93, 0x9d, 0x28, 0x11, 0x53, 0xe8, 0xb3, 0x58, 0xab, 0x17,
-	0x86, 0x73, 0x40, 0x9d, 0x95, 0x64, 0xea, 0xf4, 0x7b, 0x04, 0x33, 0x62, 0xee, 0x80, 0xcf, 0x8e,
-	0xc2, 0xac, 0x8f, 0x25, 0x26, 0x69, 0xfa, 0xf3, 0x02, 0x6a, 0xbd, 0x59, 0x54, 0x13, 0x56, 0xd0,
-	0x12, 0xee, 0xc1, 0x6c, 0xf2, 0xfa, 0x1f, 0x1d, 0x1e, 0xb9, 0xe9, 0x40, 0xad, 0x5e, 0xd0, 0xa3,
-	0x92, 0x08, 0x95, 0xe5, 0x68, 0x69, 0x5c, 0x39, 0x9a, 0xe6, 0x15, 0x03, 0x9f, 0x29, 0xaa, 0x27,
-	0x9f, 0x82, 0x61, 0x2e, 0x09, 0x74, 0xe7, 0x48, 0x7d, 0x5c, 0x49, 0xe2, 0xd6, 0xf9, 0x15, 0x82,
-	0x23, 0x83, 0x57, 0x1a, 0x7c, 0x72, 0xa0, 0x1c, 0xe9, 0xf7, 0xb8, 0x5a, 0xde, 0x8a, 0xa3, 0xae,
-	0x43, 0xe4, 0xab, 0x02, 0xc5, 0x0a, 0xbe, 0x3e, 0x36, 0x33, 0xee, 0xa9, 0x84, 0xe6, 0x8c, 0x96,
-	0xb3, 0xb1, 0xf4, 0x5f, 0x10, 0x1c, 0x50, 0x7c, 0xef, 0x87, 0x94, 0x16, 0xc3, 0x9a, 0x5c, 0x22,
-	0x70, 0x59, 0xe4, 0xcb, 0x02, 0xfe, 0x17, 0xf1, 0xb5, 0x3d, 0xc2, 0x57, 0xb0, 0x97, 0x63, 0x8e,
-	0xf4, 0x6f, 0x08, 0x8e, 0x3e, 0x4c, 0xe2, 0xfe, 0x33, 0xc2, 0xff, 0x86, 0xc0, 0xff, 0x15, 0xfc,
-	0x5a, 0xc1, 0x95, 0x63, 0x9c, 0x1a, 0x57, 0x10, 0xfe, 0x23, 0x82, 0xb2, 0x9a, 0xdf, 0xe2, 0x0b,
-	0x23, 0x13, 0x23, 0x3f, 0xe1, 0x9d, 0x64, 0x30, 0xcb, 0xfe, 0x4a, 0xce, 0x16, 0x76, 0x29, 0x29,
-	0x9f, 0x07, 0xf4, 0x33, 0x04, 0x38, 0x7d, 0x8f, 0xa4, 0x2f, 0x14, 0x7c, 0x3e, 0x27, 0x6a, 0xe4,
-	0xc3, 0xb3, 0x76, 0x61, 0xec, 0xb9, 0x7c, 0x97, 0x5a, 0x2a, 0xec, 0x52, 0x2c, 0x95, 0xff, 0x53,
-	0x04, 0xd5, 0xdb, 0x34, 0xbd, 0x0e, 0x17, 0xd8, 0x32, 0x3f, 0xa4, 0xae, 0x2d, 0x8e, 0x3f, 0x28,
-	0x11, 0x5d, 0x16, 0x88, 0xce, 0xe3, 0x62, 0x53, 0x29, 0x00, 0xbf, 0x45, 0x70, 0x70, 0x5d, 0x0f,
-	0x51, 0x7c, 0x79, 0x9c, 0xa4, 0x5c, 0x25, 0xdf, 0x3b, 0xae, 0x2f, 0x08, 0x5c, 0xcb, 0x64, 0x4f,
-	0xb8, 0x56, 0xe4, 0xac, 0xf7, 0x77, 0x08, 0x5e, 0xd1, 0xdf, 0x0f, 0x72, 0x82, 0xf7, 0x49, 0xed,
-	0x56, 0x30, 0x08, 0x24, 0xd7, 0x04, 0x3e, 0x13, 0x5f, 0xde, 0x0b, 0xbe, 0x86, 0x1c, 0xe8, 0xe1,
-	0xdf, 0x20, 0x38, 0x2a, 0x66, 0xa8, 0x3a, 0xe3, 0x81, 0x16, 0x33, 0x6a, 0xe2, 0xba, 0x87, 0x16,
-	0x23, 0xeb, 0x0f, 0x79, 0x21, 0x50, 0x2b, 0x72, 0xf6, 0x89, 0x7f, 0x86, 0xe0, 0x90, 0x6a, 0x6a,
-	0xd2, 0xbb, 0xcb, 0xe3, 0x0c, 0xf7, 0xa2, 0x4d, 0x50, 0x86, 0xdb, 0xd2, 0xde, 0xc2, 0xed, 0x7d,
-	0x04, 0x73, 0x72, 0x66, 0x59, 0x70, 0x55, 0xd0, 0x86, 0x9a, 0xb5, 0xe3, 0xb9, 0x53, 0x6a, 0x18,
-	0x46, 0xbe, 0x23, 0xc4, 0x3e, 0xc0, 0x8d, 0x22, 0xb1, 0x01, 0x73, 0xa3, 0xc6, 0x13, 0x39, 0x69,
-	0x7a, 0xda, 0x68, 0xb3, 0x56, 0xf4, 0x36, 0xc1, 0x85, 0x0d, 0x91, 0x9f, 0xb9, 0x82, 0x56, 0xbf,
-	0xf6, 0xe1, 0xce, 0x02, 0xfa, 0xc7, 0xce, 0x02, 0xfa, 0x78, 0x67, 0x01, 0xbd, 0x7d, 0x7d, 0x6f,
-	0xff, 0x88, 0xe3, 0xb4, 0x3d, 0xea, 0xc7, 0x3a, 0xdb, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x7c,
-	0x48, 0x8f, 0xa3, 0x84, 0x24, 0x00, 0x00,
+	// 2242 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcd, 0x8f, 0x1c, 0x47,
+	0x15, 0x57, 0xed, 0xe7, 0xcc, 0x1b, 0x7f, 0x56, 0x62, 0xd3, 0x69, 0xaf, 0x37, 0xab, 0xf2, 0xd7,
+	0x7a, 0xed, 0x9d, 0xb1, 0x17, 0x0b, 0x39, 0x1b, 0x10, 0x38, 0x89, 0x71, 0x1c, 0xd6, 0x8e, 0xe9,
+	0xb5, 0x31, 0x0a, 0x07, 0xa8, 0x74, 0xd7, 0xce, 0x36, 0x3b, 0xd3, 0xd5, 0xee, 0xee, 0x19, 0x6b,
+	0x65, 0x7c, 0x09, 0xe2, 0x86, 0x40, 0x82, 0x1c, 0x10, 0x42, 0x08, 0x11, 0x45, 0xe2, 0x06, 0x5c,
+	0x22, 0x24, 0x2e, 0x70, 0xe1, 0x43, 0xe2, 0x80, 0xe0, 0x1f, 0x00, 0x8b, 0x13, 0x17, 0xae, 0x1c,
+	0x51, 0xbd, 0xae, 0xee, 0xae, 0x1e, 0xcf, 0xf4, 0x8c, 0xd9, 0x8d, 0xe2, 0x5b, 0xbf, 0x9a, 0xaa,
+	0xf7, 0x7e, 0xf5, 0x3e, 0xeb, 0x3d, 0x0d, 0x9c, 0x8e, 0x45, 0xd4, 0x17, 0x51, 0x8b, 0x87, 0x61,
+	0xc7, 0x77, 0x79, 0xe2, 0xcb, 0xc0, 0xfc, 0x6e, 0x86, 0x91, 0x4c, 0x24, 0x6d, 0x18, 0x4b, 0xf6,
+	0x42, 0x5b, 0xca, 0x76, 0x47, 0xb4, 0x78, 0xe8, 0xb7, 0x78, 0x10, 0xc8, 0x04, 0x97, 0xe3, 0x74,
+	0xab, 0xcd, 0x76, 0xae, 0xc6, 0x4d, 0x5f, 0xe2, 0xaf, 0xae, 0x8c, 0x44, 0xab, 0x7f, 0xb9, 0xd5,
+	0x16, 0x81, 0x88, 0x78, 0x22, 0x3c, 0xbd, 0xe7, 0x4a, 0xb1, 0xa7, 0xcb, 0xdd, 0x6d, 0x3f, 0x10,
+	0xd1, 0x6e, 0x2b, 0xdc, 0x69, 0xab, 0x85, 0xb8, 0xd5, 0x15, 0x09, 0x1f, 0x76, 0x6a, 0xa3, 0xed,
+	0x27, 0xdb, 0xbd, 0x77, 0x9b, 0xae, 0xec, 0xb6, 0x78, 0xd4, 0x96, 0x61, 0x24, 0xbf, 0x89, 0x1f,
+	0xab, 0xae, 0xd7, 0xea, 0xaf, 0x15, 0x0c, 0xcc, 0xbb, 0xf4, 0x2f, 0xf3, 0x4e, 0xb8, 0xcd, 0x9f,
+	0xe6, 0x76, 0x7d, 0x0c, 0xb7, 0x48, 0x84, 0x52, 0xeb, 0x06, 0x3f, 0xfd, 0x44, 0x46, 0xbb, 0xc6,
+	0x67, 0xca, 0x86, 0x7d, 0x44, 0xe0, 0xc8, 0xb5, 0x42, 0xde, 0x97, 0x7b, 0x22, 0xda, 0xa5, 0x14,
+	0x66, 0x02, 0xde, 0x15, 0x16, 0x59, 0x22, 0xcb, 0x75, 0x07, 0xbf, 0xa9, 0x05, 0xf3, 0x91, 0xd8,
+	0x8a, 0x44, 0xbc, 0x6d, 0x4d, 0xe1, 0x72, 0x46, 0x52, 0x1b, 0x6a, 0x4a, 0xb8, 0x70, 0x93, 0xd8,
+	0x9a, 0x5e, 0x9a, 0x5e, 0xae, 0x3b, 0x39, 0x4d, 0x97, 0xe1, 0x70, 0x24, 0x62, 0xd9, 0x8b, 0x5c,
+	0xf1, 0x15, 0x11, 0xc5, 0xbe, 0x0c, 0xac, 0x19, 0x3c, 0x3d, 0xb8, 0xac, 0xb8, 0xc4, 0xa2, 0x23,
+	0xdc, 0x44, 0x46, 0xd6, 0x2c, 0x6e, 0xc9, 0x69, 0x85, 0x47, 0x01, 0xb7, 0xe6, 0x52, 0x3c, 0xea,
+	0x9b, 0xbd, 0x0c, 0xf5, 0xdb, 0xd2, 0x13, 0x23, 0x01, 0xb3, 0x1b, 0x70, 0xcc, 0x11, 0x7d, 0x5f,
+	0x31, 0xbf, 0x25, 0x12, 0xee, 0xf1, 0x84, 0x0f, 0x6e, 0x9e, 0xca, 0x6f, 0x67, 0x43, 0x2d, 0xd2,
+	0x9b, 0xad, 0x29, 0x5c, 0xcf, 0x69, 0xf6, 0x0b, 0x02, 0x8b, 0x86, 0x8a, 0x1c, 0x0d, 0xfc, 0x7a,
+	0x5f, 0x04, 0x49, 0x3c, 0x9a, 0xe5, 0x45, 0x38, 0x9a, 0xdd, 0xf1, 0x36, 0xef, 0x8a, 0x38, 0xe4,
+	0xae, 0xd0, 0xbc, 0x9f, 0xfe, 0x81, 0x32, 0x38, 0x60, 0x2e, 0x5a, 0xd3, 0xb8, 0xb1, 0xb4, 0x46,
+	0x97, 0xa0, 0x91, 0xd1, 0xf7, 0x6e, 0xbe, 0x61, 0xcd, 0xe0, 0x16, 0x73, 0x89, 0xbd, 0x05, 0x96,
+	0x81, 0xf4, 0x16, 0x0f, 0xfc, 0x2d, 0x11, 0x27, 0x93, 0x5e, 0x9b, 0x94, 0xae, 0x7d, 0x0c, 0x5e,
+	0x28, 0xdf, 0x3a, 0x94, 0x41, 0x2c, 0xd8, 0x6f, 0x49, 0x49, 0xc6, 0xeb, 0x91, 0xe0, 0x89, 0x70,
+	0xc4, 0x83, 0x9e, 0x88, 0x13, 0xba, 0x03, 0x66, 0xa4, 0xa1, 0xa8, 0xc6, 0xda, 0xcd, 0x66, 0xe1,
+	0xaa, 0xcd, 0xcc, 0x55, 0xf1, 0xe3, 0xeb, 0xae, 0xd7, 0xec, 0xaf, 0x35, 0xc3, 0x9d, 0x76, 0x53,
+	0x39, 0x7e, 0xd3, 0x0c, 0xdc, 0xcc, 0xf1, 0x9b, 0x26, 0x08, 0x93, 0x3b, 0x3d, 0x0e, 0x73, 0xbd,
+	0x30, 0x16, 0x51, 0x82, 0xd0, 0x6b, 0x8e, 0xa6, 0xd4, 0xa5, 0xfa, 0xbc, 0xe3, 0x7b, 0x3c, 0x51,
+	0x6a, 0x54, 0xbf, 0xe4, 0x34, 0xfb, 0xa0, 0x8c, 0xfe, 0x5e, 0xe8, 0x7d, 0x52, 0xe8, 0x4d, 0x94,
+	0x53, 0x03, 0x28, 0xfb, 0x25, 0x90, 0x6f, 0x88, 0x8e, 0x28, 0x40, 0x0e, 0x33, 0xa3, 0x05, 0xf3,
+	0x2e, 0x8f, 0x5d, 0xee, 0x65, 0xac, 0x32, 0x52, 0x39, 0x61, 0x18, 0xc9, 0x90, 0xb7, 0x91, 0xd3,
+	0x1d, 0xd9, 0xf1, 0xdd, 0x5d, 0x54, 0x4a, 0xdd, 0x79, 0xfa, 0x07, 0x76, 0x0a, 0x1a, 0x9b, 0xbb,
+	0x81, 0xfb, 0x76, 0x88, 0x09, 0x91, 0xbe, 0x08, 0xb3, 0x7e, 0x22, 0xba, 0xb1, 0x45, 0x30, 0xaa,
+	0x53, 0x82, 0xfd, 0x77, 0x06, 0x8e, 0x1b, 0xe8, 0xd4, 0x81, 0x2a, 0x6c, 0x15, 0x2e, 0xa6, 0x2c,
+	0xe8, 0x45, 0xbb, 0x4e, 0x2f, 0xd0, 0x76, 0xd2, 0x94, 0x12, 0x1c, 0x46, 0xbd, 0x40, 0x60, 0xae,
+	0xa8, 0x39, 0x29, 0x41, 0xb7, 0xa0, 0x16, 0x27, 0x2a, 0x05, 0xb6, 0x77, 0x31, 0x43, 0x34, 0xd6,
+	0xde, 0xda, 0x9b, 0x6d, 0x14, 0xf4, 0x4d, 0xcd, 0xd1, 0xc9, 0x79, 0xd3, 0x07, 0x50, 0xcf, 0x62,
+	0x2a, 0xb6, 0xe6, 0x97, 0xa6, 0x97, 0x1b, 0x6b, 0x9b, 0x7b, 0x17, 0xf4, 0x76, 0xa8, 0xd2, 0xb7,
+	0x91, 0x3f, 0x9c, 0x42, 0x0a, 0x5d, 0x80, 0x7a, 0x57, 0x07, 0x6b, 0x6c, 0xd5, 0x50, 0xdb, 0xc5,
+	0x02, 0xfd, 0x2a, 0xcc, 0xfa, 0xc1, 0x96, 0x8c, 0xad, 0x3a, 0x82, 0x79, 0x6d, 0x6f, 0x60, 0x6e,
+	0x06, 0x5b, 0xd2, 0x49, 0x19, 0xd2, 0x07, 0x70, 0x30, 0x12, 0x49, 0xb4, 0x9b, 0x69, 0xc1, 0x02,
+	0xd4, 0xeb, 0x97, 0xf6, 0x26, 0xc1, 0x31, 0x59, 0x3a, 0x65, 0x09, 0x74, 0x1d, 0x1a, 0x71, 0xe1,
+	0x63, 0x56, 0x03, 0x05, 0x5a, 0x25, 0x46, 0x86, 0x0f, 0x3a, 0xe6, 0x66, 0xf6, 0x6b, 0x02, 0x0b,
+	0x4f, 0x45, 0xef, 0x66, 0x28, 0x2a, 0x1d, 0x90, 0xc3, 0x4c, 0x1c, 0x0a, 0x17, 0x53, 0x6f, 0x63,
+	0xed, 0xd6, 0xbe, 0x85, 0x33, 0xca, 0x45, 0xd6, 0x95, 0x19, 0x87, 0xc3, 0xa7, 0x8c, 0x43, 0x77,
+	0x78, 0xe2, 0x6e, 0x57, 0xa1, 0x55, 0xae, 0xaf, 0xf6, 0xe8, 0x4a, 0x91, 0x12, 0xca, 0x3f, 0xf0,
+	0xe3, 0xee, 0x6e, 0x98, 0x95, 0x86, 0x62, 0x81, 0x05, 0x60, 0x9b, 0x69, 0x46, 0x76, 0x3a, 0xef,
+	0x72, 0x77, 0xa7, 0x4a, 0xca, 0x21, 0x98, 0xf2, 0x3d, 0x14, 0x31, 0xed, 0x4c, 0xf9, 0xde, 0xb3,
+	0x05, 0xa2, 0x7a, 0x33, 0xd8, 0x43, 0x0a, 0x62, 0x95, 0xc0, 0x05, 0xa8, 0x07, 0x03, 0x45, 0xb0,
+	0x58, 0x98, 0xa8, 0xf8, 0x59, 0x30, 0xdf, 0xcf, 0x5f, 0x10, 0xea, 0xe7, 0x8c, 0x54, 0x20, 0xdb,
+	0x91, 0xec, 0x85, 0xd6, 0x6c, 0xaa, 0x32, 0x24, 0x14, 0x8a, 0x1d, 0x3f, 0xf0, 0xac, 0xb9, 0x14,
+	0x85, 0xfa, 0x66, 0xff, 0x21, 0xf0, 0xf2, 0x10, 0xe0, 0x63, 0x8d, 0xf2, 0x5c, 0xa0, 0x2f, 0x5c,
+	0x63, 0x7e, 0xa4, 0x6b, 0xd4, 0x06, 0x5d, 0xe3, 0xdf, 0x04, 0x96, 0x86, 0xdc, 0x78, 0x7c, 0x49,
+	0x79, 0x6e, 0xae, 0xbc, 0x25, 0x23, 0x57, 0x58, 0xf3, 0xa9, 0xff, 0x21, 0xa1, 0xbc, 0x55, 0x46,
+	0xe1, 0x36, 0x0f, 0xac, 0x5a, 0xea, 0xad, 0x29, 0xc5, 0xfe, 0x42, 0xc0, 0xca, 0x6e, 0x78, 0xcd,
+	0xc5, 0xfb, 0xf6, 0x82, 0xe7, 0xff, 0x92, 0xc7, 0x61, 0x8e, 0x23, 0x5a, 0x6d, 0x58, 0x4d, 0xb1,
+	0xef, 0x10, 0x38, 0x51, 0xbe, 0x4e, 0xbc, 0xe1, 0xc7, 0x49, 0xf6, 0x12, 0xa3, 0x5b, 0x30, 0x9f,
+	0xee, 0x4c, 0x0b, 0x74, 0x63, 0x6d, 0x63, 0xaf, 0x69, 0xbb, 0xa4, 0xba, 0x8c, 0x39, 0x7b, 0x05,
+	0x4e, 0x0c, 0x8d, 0x76, 0x0d, 0xc3, 0x86, 0x5a, 0x56, 0xaa, 0xb4, 0x72, 0x73, 0x9a, 0xfd, 0x71,
+	0xba, 0x9c, 0xfd, 0xa4, 0xb7, 0x21, 0xdb, 0x15, 0x6f, 0xe6, 0x6a, 0x83, 0x58, 0x30, 0x1f, 0x4a,
+	0x4f, 0xdb, 0x02, 0x5b, 0x10, 0x4d, 0xaa, 0x73, 0xae, 0x0c, 0x12, 0xae, 0x3a, 0x31, 0x6d, 0x88,
+	0x62, 0x41, 0x19, 0x32, 0xf6, 0x03, 0x57, 0x6c, 0x0a, 0x57, 0x06, 0x5e, 0x8c, 0x16, 0x99, 0x76,
+	0x4a, 0x6b, 0xf4, 0x4d, 0xa8, 0x23, 0x7d, 0xd7, 0xef, 0x0a, 0xec, 0x33, 0x1a, 0x6b, 0x2b, 0xcd,
+	0xb4, 0xcd, 0x6b, 0x9a, 0x6d, 0x5e, 0xa1, 0x43, 0xd5, 0xe6, 0x35, 0xfb, 0x97, 0x9b, 0xea, 0x84,
+	0x53, 0x1c, 0x56, 0x58, 0x12, 0xee, 0x77, 0x36, 0xfc, 0x00, 0x9f, 0x0f, 0x4a, 0x54, 0xb1, 0xa0,
+	0x8c, 0xbd, 0x25, 0x3b, 0x1d, 0xf9, 0x10, 0x63, 0xb5, 0xe6, 0x68, 0x4a, 0x9d, 0xea, 0x05, 0x89,
+	0xdf, 0x41, 0xf9, 0x75, 0xbc, 0x5d, 0xb1, 0x80, 0xa7, 0xfc, 0x4e, 0x22, 0x22, 0x2c, 0xd0, 0x75,
+	0x47, 0x53, 0xb9, 0x3b, 0x35, 0xd2, 0xbe, 0x27, 0x8b, 0x99, 0xd4, 0xf1, 0x0e, 0xe0, 0xa2, 0x76,
+	0xbc, 0x41, 0x67, 0x3e, 0x88, 0x3f, 0x96, 0x9d, 0x19, 0x1b, 0x39, 0xd1, 0xf7, 0x65, 0x2f, 0xb6,
+	0x0e, 0xa5, 0x65, 0x2c, 0xa3, 0xd9, 0xef, 0x08, 0xd4, 0x36, 0x64, 0xfb, 0x7a, 0x90, 0x44, 0xbb,
+	0xf8, 0xde, 0x94, 0x41, 0x22, 0x82, 0xcc, 0xe2, 0x19, 0xa9, 0xd4, 0x98, 0xf8, 0x5d, 0xb1, 0x99,
+	0xf0, 0x6e, 0xa8, 0x2b, 0xee, 0x33, 0xa9, 0x31, 0x3f, 0xac, 0xae, 0xd6, 0xe1, 0x71, 0x82, 0x51,
+	0x57, 0x73, 0xf0, 0x5b, 0x5d, 0x22, 0xdf, 0xb0, 0x99, 0x64, 0x96, 0x2e, 0xad, 0x99, 0x4e, 0x92,
+	0x46, 0x5e, 0x46, 0xb2, 0x16, 0xbc, 0x94, 0x3f, 0xc2, 0xee, 0x8a, 0xa8, 0xeb, 0x07, 0xbc, 0x32,
+	0x07, 0xb2, 0xcb, 0x25, 0xc7, 0x57, 0xaf, 0x92, 0xfb, 0x7e, 0xe0, 0xc9, 0x87, 0xa3, 0x1d, 0x98,
+	0xfd, 0xad, 0xdc, 0x2b, 0x1a, 0x67, 0xf2, 0x78, 0x79, 0x13, 0x0e, 0xaa, 0xc8, 0xea, 0x0b, 0xfd,
+	0x83, 0x0e, 0x5e, 0x56, 0x0a, 0xca, 0xa1, 0x3c, 0x9c, 0xf2, 0x41, 0xba, 0x01, 0x87, 0x79, 0x1c,
+	0xfb, 0xed, 0x40, 0x78, 0x19, 0xaf, 0xa9, 0x89, 0x79, 0x0d, 0x1e, 0x4d, 0x9b, 0x08, 0xdc, 0xa1,
+	0x75, 0x9e, 0x91, 0xec, 0xdb, 0x04, 0x8e, 0x0d, 0x65, 0x92, 0xfb, 0x1f, 0x31, 0xd2, 0x99, 0x6a,
+	0xe4, 0xdd, 0x6d, 0xe1, 0xf5, 0x3a, 0x59, 0x08, 0xe7, 0xb4, 0xfa, 0xcd, 0xeb, 0xa5, 0x16, 0xd0,
+	0xe9, 0x34, 0xa7, 0xe9, 0x22, 0x40, 0x97, 0x07, 0x3d, 0xde, 0x41, 0x08, 0x33, 0x08, 0xc1, 0x58,
+	0x61, 0x0b, 0x60, 0x0f, 0x33, 0x9f, 0x6e, 0x4b, 0x7f, 0x45, 0xe0, 0x50, 0x96, 0x9a, 0xb4, 0x7d,
+	0x96, 0xe1, 0xb0, 0xa1, 0x86, 0xdb, 0x85, 0xa9, 0x06, 0x97, 0x07, 0xd3, 0x0e, 0x29, 0xa7, 0x9d,
+	0xcc, 0xce, 0xd3, 0xe5, 0x69, 0x48, 0xbf, 0x34, 0xcf, 0x18, 0x96, 0xf7, 0xc9, 0xb0, 0xbc, 0x9f,
+	0x07, 0x2a, 0xfb, 0x16, 0x58, 0xb7, 0x78, 0xc0, 0xdb, 0xc2, 0xcb, 0x81, 0xe7, 0x4e, 0xf2, 0x0d,
+	0xb3, 0xf5, 0xda, 0x73, 0xa3, 0x93, 0x97, 0x7d, 0x7f, 0x6b, 0x4b, 0xb7, 0x71, 0x6b, 0xff, 0x5c,
+	0x04, 0x6a, 0x1a, 0x55, 0x44, 0x7d, 0xdf, 0x15, 0xf4, 0x07, 0x04, 0x66, 0x54, 0x95, 0xa1, 0x27,
+	0x47, 0xf9, 0x10, 0x2a, 0xd7, 0xde, 0xbf, 0x77, 0xb4, 0x92, 0xc6, 0x16, 0xde, 0xfb, 0xfb, 0xbf,
+	0x7e, 0x38, 0x75, 0x9c, 0xbe, 0x88, 0x73, 0xb7, 0xfe, 0x65, 0x73, 0x06, 0x16, 0xd3, 0xef, 0x12,
+	0xa0, 0xba, 0xf4, 0x19, 0xa3, 0x17, 0x7a, 0x61, 0x14, 0xc4, 0x21, 0x23, 0x1a, 0xfb, 0xa4, 0x91,
+	0x86, 0x9a, 0xae, 0x8c, 0x84, 0x4a, 0x3a, 0xb8, 0x01, 0x01, 0xac, 0x20, 0x80, 0xd3, 0x94, 0x0d,
+	0x03, 0xd0, 0x7a, 0xa4, 0x8c, 0xfe, 0xb8, 0x25, 0x52, 0xb9, 0x3f, 0x27, 0x30, 0x7b, 0x1f, 0x1f,
+	0x5f, 0x63, 0x94, 0xb4, 0xb9, 0x6f, 0x4a, 0x42, 0x71, 0x88, 0x96, 0x9d, 0x42, 0xa4, 0x27, 0xe9,
+	0x89, 0x0c, 0x69, 0x9c, 0x44, 0x82, 0x77, 0x4b, 0x80, 0x2f, 0x11, 0xfa, 0x21, 0x81, 0xb9, 0x74,
+	0x38, 0x43, 0xcf, 0x8c, 0x42, 0x59, 0x1a, 0xde, 0xd8, 0xfb, 0x37, 0xe9, 0x60, 0xe7, 0x11, 0xe3,
+	0x29, 0x36, 0xd4, 0x9c, 0xeb, 0xa5, 0x39, 0xc8, 0xfb, 0x04, 0xa6, 0x6f, 0x88, 0xb1, 0xfe, 0xb6,
+	0x8f, 0xe0, 0x9e, 0x52, 0xe0, 0x10, 0x53, 0xd3, 0x0f, 0x08, 0xbc, 0x74, 0x43, 0x24, 0xc3, 0x73,
+	0x39, 0x5d, 0x1e, 0x9f, 0x60, 0xb5, 0xdb, 0x5d, 0x98, 0x60, 0x67, 0x9e, 0xc4, 0x5a, 0x88, 0xec,
+	0x3c, 0x3d, 0x57, 0xe5, 0x84, 0xaa, 0x21, 0x7e, 0xa8, 0x71, 0xfc, 0x99, 0xc0, 0x91, 0xc1, 0x21,
+	0x27, 0x2d, 0x67, 0xff, 0xa1, 0x33, 0x50, 0xfb, 0xf6, 0x5e, 0x13, 0x4a, 0x99, 0x29, 0xbb, 0x86,
+	0xc8, 0x5f, 0xa5, 0xaf, 0x54, 0x21, 0xcf, 0xe6, 0x3e, 0x71, 0xeb, 0x51, 0xf6, 0xf9, 0x18, 0xa7,
+	0xe5, 0x08, 0xfb, 0x3d, 0x02, 0x07, 0x6e, 0x88, 0xe4, 0x56, 0x3e, 0xf6, 0x18, 0xe9, 0xb6, 0xa5,
+	0xb9, 0xa6, 0xbd, 0xd0, 0x34, 0x86, 0xda, 0xd9, 0x4f, 0xb9, 0x4a, 0x57, 0x11, 0xd8, 0x39, 0x7a,
+	0xa6, 0x0a, 0x58, 0x31, 0x6a, 0xf9, 0x3d, 0x81, 0xb9, 0x74, 0xac, 0x30, 0x5a, 0x7c, 0x69, 0x68,
+	0xb8, 0x9f, 0x8e, 0x79, 0x1d, 0xb1, 0x7e, 0xde, 0xbe, 0x34, 0x1c, 0xab, 0x79, 0x3e, 0xd3, 0x5a,
+	0x13, 0x2f, 0x50, 0x8e, 0xa8, 0x8f, 0x08, 0x40, 0x31, 0x1a, 0xa1, 0xe7, 0xab, 0xef, 0x61, 0x8c,
+	0x4f, 0xec, 0xfd, 0x1d, 0x8e, 0xb0, 0x26, 0xde, 0x67, 0xd9, 0x5e, 0xaa, 0x74, 0xe7, 0x50, 0xb8,
+	0xeb, 0xe9, 0x18, 0xe5, 0x67, 0x04, 0x66, 0xb1, 0x17, 0xa7, 0xa7, 0x47, 0x61, 0x36, 0x5b, 0xf5,
+	0xfd, 0x54, 0xfd, 0x59, 0x84, 0xba, 0xb4, 0x56, 0x95, 0x13, 0xd6, 0xc9, 0x0a, 0xed, 0xc3, 0x5c,
+	0xda, 0x3b, 0x8f, 0x76, 0x8f, 0x52, 0x6f, 0x6d, 0x2f, 0x55, 0xd4, 0xa8, 0xd4, 0x43, 0x75, 0x3a,
+	0x5a, 0x19, 0x97, 0x8e, 0x66, 0x54, 0xc6, 0xa0, 0xa7, 0xaa, 0xf2, 0xc9, 0xc7, 0xa0, 0x98, 0x0b,
+	0x88, 0xee, 0x0c, 0x5b, 0x1a, 0x97, 0x92, 0x94, 0x76, 0x7e, 0x44, 0xe0, 0xc8, 0xe0, 0x93, 0x86,
+	0x9e, 0x18, 0x48, 0x47, 0xe6, 0x1b, 0xcd, 0x2e, 0x6b, 0x71, 0xd4, 0x73, 0x88, 0x7d, 0x01, 0x51,
+	0xac, 0xd3, 0xab, 0x63, 0x23, 0xe3, 0x76, 0x16, 0xd0, 0x8a, 0xd1, 0x6a, 0x31, 0x61, 0xfd, 0x0d,
+	0x81, 0x03, 0x19, 0xdf, 0xbb, 0x91, 0x10, 0xd5, 0xb0, 0xf6, 0x2f, 0x10, 0x94, 0x2c, 0xf6, 0x59,
+	0x84, 0xff, 0x19, 0x7a, 0x65, 0x42, 0xf8, 0x19, 0xec, 0xd5, 0x44, 0x21, 0xfd, 0x03, 0x81, 0xa3,
+	0xf7, 0x53, 0xbf, 0xff, 0x84, 0xf0, 0xbf, 0x8e, 0xf8, 0x3f, 0x47, 0x5f, 0xad, 0x78, 0x72, 0x8c,
+	0xbb, 0xc6, 0x25, 0x42, 0x7f, 0x49, 0xa0, 0x96, 0x4d, 0x27, 0xe9, 0xb9, 0x91, 0x81, 0x51, 0x9e,
+	0x5f, 0xee, 0xa7, 0x33, 0xeb, 0xfa, 0xca, 0x4e, 0x57, 0x56, 0x29, 0x2d, 0x5f, 0x39, 0xf4, 0xfb,
+	0x04, 0x68, 0xde, 0x6b, 0xe4, 0xdd, 0x07, 0x3d, 0x5b, 0x12, 0x35, 0xb2, 0xa9, 0xb4, 0xcf, 0x8d,
+	0xdd, 0x57, 0xae, 0x52, 0x2b, 0x95, 0x55, 0x4a, 0xe6, 0xf2, 0xbf, 0x47, 0xa0, 0x71, 0x43, 0xe4,
+	0xcf, 0xe1, 0x0a, 0x5d, 0x96, 0x47, 0xb3, 0xf6, 0xf2, 0xf8, 0x8d, 0x1a, 0xd1, 0x45, 0x44, 0x74,
+	0x96, 0x56, 0xab, 0x2a, 0x03, 0xf0, 0x13, 0x02, 0x07, 0xef, 0x98, 0x2e, 0x4a, 0x2f, 0x8e, 0x93,
+	0x54, 0xca, 0xe4, 0x93, 0xe3, 0xfa, 0x34, 0xe2, 0x5a, 0x65, 0x13, 0xe1, 0x5a, 0xd7, 0x33, 0xd2,
+	0x9f, 0x12, 0x78, 0xc1, 0xec, 0x1f, 0xf4, 0x34, 0xed, 0xff, 0xd5, 0x5b, 0xc5, 0x50, 0x8e, 0x5d,
+	0x41, 0x7c, 0x4d, 0x7a, 0x71, 0x12, 0x7c, 0x2d, 0x3d, 0x62, 0xa3, 0x3f, 0x26, 0x70, 0x14, 0x67,
+	0x95, 0x26, 0xe3, 0x81, 0x12, 0x33, 0x6a, 0xb2, 0x39, 0x41, 0x89, 0xd1, 0xf9, 0x87, 0x3d, 0x13,
+	0xa8, 0x75, 0x3d, 0x87, 0xa4, 0xdf, 0x27, 0x70, 0x28, 0x2b, 0x6a, 0xda, 0xba, 0xab, 0xe3, 0x14,
+	0xf7, 0xac, 0x45, 0x50, 0xbb, 0xdb, 0xca, 0x64, 0xee, 0xf6, 0x21, 0x81, 0x79, 0x3d, 0x4b, 0xac,
+	0x78, 0x2a, 0x18, 0xc3, 0x46, 0xfb, 0x58, 0x69, 0x57, 0x36, 0xc8, 0x62, 0x5f, 0x43, 0xb1, 0xf7,
+	0x68, 0xab, 0x4a, 0x6c, 0x28, 0xbd, 0xb8, 0xf5, 0x48, 0x4f, 0x91, 0x1e, 0xb7, 0x3a, 0xb2, 0x1d,
+	0xbf, 0xc3, 0x68, 0x65, 0x41, 0x54, 0x7b, 0x2e, 0x91, 0xd7, 0xbe, 0xf8, 0xa7, 0x27, 0x8b, 0xe4,
+	0xaf, 0x4f, 0x16, 0xc9, 0x3f, 0x9e, 0x2c, 0x92, 0x77, 0xae, 0x4e, 0xf6, 0xff, 0x0f, 0xb7, 0xe3,
+	0x8b, 0x20, 0x31, 0xd9, 0xfe, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xcb, 0x0e, 0xf7, 0xb1, 0xe5, 0x22,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -3314,21 +3306,27 @@ func (m *ApplicationQuery) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
-	i -= len(m.Repo)
-	copy(dAtA[i:], m.Repo)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Repo)))
-	i--
-	dAtA[i] = 0x32
-	i -= len(m.Selector)
-	copy(dAtA[i:], m.Selector)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Selector)))
-	i--
-	dAtA[i] = 0x2a
-	i -= len(m.ResourceVersion)
-	copy(dAtA[i:], m.ResourceVersion)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.ResourceVersion)))
-	i--
-	dAtA[i] = 0x22
+	if m.Repo != nil {
+		i -= len(*m.Repo)
+		copy(dAtA[i:], *m.Repo)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Repo)))
+		i--
+		dAtA[i] = 0x32
+	}
+	if m.Selector != nil {
+		i -= len(*m.Selector)
+		copy(dAtA[i:], *m.Selector)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Selector)))
+		i--
+		dAtA[i] = 0x2a
+	}
+	if m.ResourceVersion != nil {
+		i -= len(*m.ResourceVersion)
+		copy(dAtA[i:], *m.ResourceVersion)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.ResourceVersion)))
+		i--
+		dAtA[i] = 0x22
+	}
 	if len(m.Projects) > 0 {
 		for iNdEx := len(m.Projects) - 1; iNdEx >= 0; iNdEx-- {
 			i -= len(m.Projects[iNdEx])
@@ -3458,21 +3456,33 @@ func (m *ApplicationResourceEventsQuery) MarshalToSizedBuffer(dAtA []byte) (int,
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
-	i -= len(m.ResourceUID)
-	copy(dAtA[i:], m.ResourceUID)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.ResourceUID)))
-	i--
-	dAtA[i] = 0x22
-	i -= len(m.ResourceName)
-	copy(dAtA[i:], m.ResourceName)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.ResourceName)))
-	i--
-	dAtA[i] = 0x1a
-	i -= len(m.ResourceNamespace)
-	copy(dAtA[i:], m.ResourceNamespace)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.ResourceNamespace)))
-	i--
-	dAtA[i] = 0x12
+	if m.ResourceUID == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("resourceUID")
+	} else {
+		i -= len(*m.ResourceUID)
+		copy(dAtA[i:], *m.ResourceUID)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.ResourceUID)))
+		i--
+		dAtA[i] = 0x22
+	}
+	if m.ResourceName == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("resourceName")
+	} else {
+		i -= len(*m.ResourceName)
+		copy(dAtA[i:], *m.ResourceName)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.ResourceName)))
+		i--
+		dAtA[i] = 0x1a
+	}
+	if m.ResourceNamespace == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("resourceNamespace")
+	} else {
+		i -= len(*m.ResourceNamespace)
+		copy(dAtA[i:], *m.ResourceNamespace)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.ResourceNamespace)))
+		i--
+		dAtA[i] = 0x12
+	}
 	if m.Name == nil {
 		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("name")
 	} else {
@@ -3509,11 +3519,13 @@ func (m *ApplicationManifestQuery) MarshalToSizedBuffer(dAtA []byte) (int, error
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
-	i -= len(m.Revision)
-	copy(dAtA[i:], m.Revision)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Revision)))
-	i--
-	dAtA[i] = 0x12
+	if m.Revision != nil {
+		i -= len(*m.Revision)
+		copy(dAtA[i:], *m.Revision)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Revision)))
+		i--
+		dAtA[i] = 0x12
+	}
 	if m.Name == nil {
 		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("name")
 	} else {
@@ -3597,16 +3609,20 @@ func (m *ApplicationCreateRequest) MarshalToSizedBuffer(dAtA []byte) (int, error
 		i--
 		dAtA[i] = 0x10
 	}
-	{
-		size, err := m.Application.MarshalToSizedBuffer(dAtA[:i])
-		if err != nil {
-			return 0, err
+	if m.Application == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("application")
+	} else {
+		{
+			size, err := m.Application.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintApplication(dAtA, i, uint64(size))
 		}
-		i -= size
-		i = encodeVarintApplication(dAtA, i, uint64(size))
+		i--
+		dAtA[i] = 0xa
 	}
-	i--
-	dAtA[i] = 0xa
 	return len(dAtA) - i, nil
 }
 
@@ -3847,27 +3863,33 @@ func (m *ApplicationSyncRequest) MarshalToSizedBuffer(dAtA []byte) (int, error)
 		i--
 		dAtA[i] = 0x2a
 	}
-	i--
-	if m.Prune {
-		dAtA[i] = 1
-	} else {
-		dAtA[i] = 0
+	if m.Prune != nil {
+		i--
+		if *m.Prune {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x20
+	}
+	if m.DryRun != nil {
+		i--
+		if *m.DryRun {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x18
+	}
+	if m.Revision != nil {
+		i -= len(*m.Revision)
+		copy(dAtA[i:], *m.Revision)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Revision)))
+		i--
+		dAtA[i] = 0x12
 	}
-	i--
-	dAtA[i] = 0x20
-	i--
-	if m.DryRun {
-		dAtA[i] = 1
-	} else {
-		dAtA[i] = 0
-	}
-	i--
-	dAtA[i] = 0x18
-	i -= len(m.Revision)
-	copy(dAtA[i:], m.Revision)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Revision)))
-	i--
-	dAtA[i] = 0x12
 	if m.Name == nil {
 		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("name")
 	} else {
@@ -3914,16 +3936,20 @@ func (m *ApplicationUpdateSpecRequest) MarshalToSizedBuffer(dAtA []byte) (int, e
 		i--
 		dAtA[i] = 0x18
 	}
-	{
-		size, err := m.Spec.MarshalToSizedBuffer(dAtA[:i])
-		if err != nil {
-			return 0, err
+	if m.Spec == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("spec")
+	} else {
+		{
+			size, err := m.Spec.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintApplication(dAtA, i, uint64(size))
 		}
-		i -= size
-		i = encodeVarintApplication(dAtA, i, uint64(size))
+		i--
+		dAtA[i] = 0x12
 	}
-	i--
-	dAtA[i] = 0x12
 	if m.Name == nil {
 		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("name")
 	} else {
@@ -3960,16 +3986,24 @@ func (m *ApplicationPatchRequest) MarshalToSizedBuffer(dAtA []byte) (int, error)
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
-	i -= len(m.PatchType)
-	copy(dAtA[i:], m.PatchType)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.PatchType)))
-	i--
-	dAtA[i] = 0x1a
-	i -= len(m.Patch)
-	copy(dAtA[i:], m.Patch)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Patch)))
-	i--
-	dAtA[i] = 0x12
+	if m.PatchType == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("patchType")
+	} else {
+		i -= len(*m.PatchType)
+		copy(dAtA[i:], *m.PatchType)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.PatchType)))
+		i--
+		dAtA[i] = 0x1a
+	}
+	if m.Patch == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("patch")
+	} else {
+		i -= len(*m.Patch)
+		copy(dAtA[i:], *m.Patch)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Patch)))
+		i--
+		dAtA[i] = 0x12
+	}
 	if m.Name == nil {
 		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("name")
 	} else {
@@ -4006,25 +4040,33 @@ func (m *ApplicationRollbackRequest) MarshalToSizedBuffer(dAtA []byte) (int, err
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
-	i--
-	if m.Prune {
-		dAtA[i] = 1
-	} else {
-		dAtA[i] = 0
+	if m.Prune != nil {
+		i--
+		if *m.Prune {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x20
 	}
-	i--
-	dAtA[i] = 0x20
-	i--
-	if m.DryRun {
-		dAtA[i] = 1
+	if m.DryRun != nil {
+		i--
+		if *m.DryRun {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x18
+	}
+	if m.Id == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("id")
 	} else {
-		dAtA[i] = 0
+		i = encodeVarintApplication(dAtA, i, uint64(*m.Id))
+		i--
+		dAtA[i] = 0x10
 	}
-	i--
-	dAtA[i] = 0x18
-	i = encodeVarintApplication(dAtA, i, uint64(m.ID))
-	i--
-	dAtA[i] = 0x10
 	if m.Name == nil {
 		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("name")
 	} else {
@@ -4061,31 +4103,51 @@ func (m *ApplicationResourceRequest) MarshalToSizedBuffer(dAtA []byte) (int, err
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
-	i -= len(m.Kind)
-	copy(dAtA[i:], m.Kind)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Kind)))
-	i--
-	dAtA[i] = 0x32
-	i -= len(m.Group)
-	copy(dAtA[i:], m.Group)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Group)))
-	i--
-	dAtA[i] = 0x2a
-	i -= len(m.Version)
-	copy(dAtA[i:], m.Version)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Version)))
-	i--
-	dAtA[i] = 0x22
-	i -= len(m.ResourceName)
-	copy(dAtA[i:], m.ResourceName)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.ResourceName)))
-	i--
-	dAtA[i] = 0x1a
-	i -= len(m.Namespace)
-	copy(dAtA[i:], m.Namespace)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Namespace)))
-	i--
-	dAtA[i] = 0x12
+	if m.Kind == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("kind")
+	} else {
+		i -= len(*m.Kind)
+		copy(dAtA[i:], *m.Kind)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Kind)))
+		i--
+		dAtA[i] = 0x32
+	}
+	if m.Group == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("group")
+	} else {
+		i -= len(*m.Group)
+		copy(dAtA[i:], *m.Group)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Group)))
+		i--
+		dAtA[i] = 0x2a
+	}
+	if m.Version == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("version")
+	} else {
+		i -= len(*m.Version)
+		copy(dAtA[i:], *m.Version)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Version)))
+		i--
+		dAtA[i] = 0x22
+	}
+	if m.ResourceName == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("resourceName")
+	} else {
+		i -= len(*m.ResourceName)
+		copy(dAtA[i:], *m.ResourceName)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.ResourceName)))
+		i--
+		dAtA[i] = 0x1a
+	}
+	if m.Namespace == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("namespace")
+	} else {
+		i -= len(*m.Namespace)
+		copy(dAtA[i:], *m.Namespace)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Namespace)))
+		i--
+		dAtA[i] = 0x12
+	}
 	if m.Name == nil {
 		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("name")
 	} else {
@@ -4122,41 +4184,69 @@ func (m *ApplicationResourcePatchRequest) MarshalToSizedBuffer(dAtA []byte) (int
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
-	i -= len(m.PatchType)
-	copy(dAtA[i:], m.PatchType)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.PatchType)))
-	i--
-	dAtA[i] = 0x42
-	i -= len(m.Patch)
-	copy(dAtA[i:], m.Patch)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Patch)))
-	i--
-	dAtA[i] = 0x3a
-	i -= len(m.Kind)
-	copy(dAtA[i:], m.Kind)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Kind)))
-	i--
-	dAtA[i] = 0x32
-	i -= len(m.Group)
-	copy(dAtA[i:], m.Group)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Group)))
-	i--
-	dAtA[i] = 0x2a
-	i -= len(m.Version)
-	copy(dAtA[i:], m.Version)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Version)))
-	i--
-	dAtA[i] = 0x22
-	i -= len(m.ResourceName)
-	copy(dAtA[i:], m.ResourceName)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.ResourceName)))
-	i--
-	dAtA[i] = 0x1a
-	i -= len(m.Namespace)
-	copy(dAtA[i:], m.Namespace)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Namespace)))
-	i--
-	dAtA[i] = 0x12
+	if m.PatchType == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("patchType")
+	} else {
+		i -= len(*m.PatchType)
+		copy(dAtA[i:], *m.PatchType)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.PatchType)))
+		i--
+		dAtA[i] = 0x42
+	}
+	if m.Patch == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("patch")
+	} else {
+		i -= len(*m.Patch)
+		copy(dAtA[i:], *m.Patch)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Patch)))
+		i--
+		dAtA[i] = 0x3a
+	}
+	if m.Kind == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("kind")
+	} else {
+		i -= len(*m.Kind)
+		copy(dAtA[i:], *m.Kind)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Kind)))
+		i--
+		dAtA[i] = 0x32
+	}
+	if m.Group == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("group")
+	} else {
+		i -= len(*m.Group)
+		copy(dAtA[i:], *m.Group)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Group)))
+		i--
+		dAtA[i] = 0x2a
+	}
+	if m.Version == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("version")
+	} else {
+		i -= len(*m.Version)
+		copy(dAtA[i:], *m.Version)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Version)))
+		i--
+		dAtA[i] = 0x22
+	}
+	if m.ResourceName == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("resourceName")
+	} else {
+		i -= len(*m.ResourceName)
+		copy(dAtA[i:], *m.ResourceName)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.ResourceName)))
+		i--
+		dAtA[i] = 0x1a
+	}
+	if m.Namespace == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("namespace")
+	} else {
+		i -= len(*m.Namespace)
+		copy(dAtA[i:], *m.Namespace)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Namespace)))
+		i--
+		dAtA[i] = 0x12
+	}
 	if m.Name == nil {
 		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("name")
 	} else {
@@ -4213,31 +4303,51 @@ func (m *ApplicationResourceDeleteRequest) MarshalToSizedBuffer(dAtA []byte) (in
 		i--
 		dAtA[i] = 0x38
 	}
-	i -= len(m.Kind)
-	copy(dAtA[i:], m.Kind)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Kind)))
-	i--
-	dAtA[i] = 0x32
-	i -= len(m.Group)
-	copy(dAtA[i:], m.Group)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Group)))
-	i--
-	dAtA[i] = 0x2a
-	i -= len(m.Version)
-	copy(dAtA[i:], m.Version)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Version)))
-	i--
-	dAtA[i] = 0x22
-	i -= len(m.ResourceName)
-	copy(dAtA[i:], m.ResourceName)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.ResourceName)))
-	i--
-	dAtA[i] = 0x1a
-	i -= len(m.Namespace)
-	copy(dAtA[i:], m.Namespace)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Namespace)))
-	i--
-	dAtA[i] = 0x12
+	if m.Kind == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("kind")
+	} else {
+		i -= len(*m.Kind)
+		copy(dAtA[i:], *m.Kind)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Kind)))
+		i--
+		dAtA[i] = 0x32
+	}
+	if m.Group == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("group")
+	} else {
+		i -= len(*m.Group)
+		copy(dAtA[i:], *m.Group)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Group)))
+		i--
+		dAtA[i] = 0x2a
+	}
+	if m.Version == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("version")
+	} else {
+		i -= len(*m.Version)
+		copy(dAtA[i:], *m.Version)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Version)))
+		i--
+		dAtA[i] = 0x22
+	}
+	if m.ResourceName == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("resourceName")
+	} else {
+		i -= len(*m.ResourceName)
+		copy(dAtA[i:], *m.ResourceName)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.ResourceName)))
+		i--
+		dAtA[i] = 0x1a
+	}
+	if m.Namespace == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("namespace")
+	} else {
+		i -= len(*m.Namespace)
+		copy(dAtA[i:], *m.Namespace)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Namespace)))
+		i--
+		dAtA[i] = 0x12
+	}
 	if m.Name == nil {
 		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("name")
 	} else {
@@ -4274,36 +4384,60 @@ func (m *ResourceActionRunRequest) MarshalToSizedBuffer(dAtA []byte) (int, error
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
-	i -= len(m.Action)
-	copy(dAtA[i:], m.Action)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Action)))
-	i--
-	dAtA[i] = 0x3a
-	i -= len(m.Kind)
-	copy(dAtA[i:], m.Kind)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Kind)))
-	i--
-	dAtA[i] = 0x32
-	i -= len(m.Group)
-	copy(dAtA[i:], m.Group)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Group)))
-	i--
-	dAtA[i] = 0x2a
-	i -= len(m.Version)
-	copy(dAtA[i:], m.Version)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Version)))
-	i--
-	dAtA[i] = 0x22
-	i -= len(m.ResourceName)
-	copy(dAtA[i:], m.ResourceName)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.ResourceName)))
-	i--
-	dAtA[i] = 0x1a
-	i -= len(m.Namespace)
-	copy(dAtA[i:], m.Namespace)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Namespace)))
-	i--
-	dAtA[i] = 0x12
+	if m.Action == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("action")
+	} else {
+		i -= len(*m.Action)
+		copy(dAtA[i:], *m.Action)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Action)))
+		i--
+		dAtA[i] = 0x3a
+	}
+	if m.Kind == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("kind")
+	} else {
+		i -= len(*m.Kind)
+		copy(dAtA[i:], *m.Kind)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Kind)))
+		i--
+		dAtA[i] = 0x32
+	}
+	if m.Group == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("group")
+	} else {
+		i -= len(*m.Group)
+		copy(dAtA[i:], *m.Group)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Group)))
+		i--
+		dAtA[i] = 0x2a
+	}
+	if m.Version == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("version")
+	} else {
+		i -= len(*m.Version)
+		copy(dAtA[i:], *m.Version)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Version)))
+		i--
+		dAtA[i] = 0x22
+	}
+	if m.ResourceName == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("resourceName")
+	} else {
+		i -= len(*m.ResourceName)
+		copy(dAtA[i:], *m.ResourceName)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.ResourceName)))
+		i--
+		dAtA[i] = 0x1a
+	}
+	if m.Namespace == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("namespace")
+	} else {
+		i -= len(*m.Namespace)
+		copy(dAtA[i:], *m.Namespace)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Namespace)))
+		i--
+		dAtA[i] = 0x12
+	}
 	if m.Name == nil {
 		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("name")
 	} else {
@@ -4381,11 +4515,15 @@ func (m *ApplicationResourceResponse) MarshalToSizedBuffer(dAtA []byte) (int, er
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
-	i -= len(m.Manifest)
-	copy(dAtA[i:], m.Manifest)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Manifest)))
-	i--
-	dAtA[i] = 0xa
+	if m.Manifest == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("manifest")
+	} else {
+		i -= len(*m.Manifest)
+		copy(dAtA[i:], *m.Manifest)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Manifest)))
+		i--
+		dAtA[i] = 0xa
+	}
 	return len(dAtA) - i, nil
 }
 
@@ -4413,14 +4551,16 @@ func (m *ApplicationPodLogsQuery) MarshalToSizedBuffer(dAtA []byte) (int, error)
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
-	i--
-	if m.Previous {
-		dAtA[i] = 1
-	} else {
-		dAtA[i] = 0
+	if m.Previous != nil {
+		i--
+		if *m.Previous {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x70
 	}
-	i--
-	dAtA[i] = 0x70
 	if m.ResourceName != nil {
 		i -= len(*m.ResourceName)
 		copy(dAtA[i:], *m.ResourceName)
@@ -4456,17 +4596,25 @@ func (m *ApplicationPodLogsQuery) MarshalToSizedBuffer(dAtA []byte) (int, error)
 		i--
 		dAtA[i] = 0x4a
 	}
-	i--
-	if m.Follow {
-		dAtA[i] = 1
+	if m.Follow == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("follow")
 	} else {
-		dAtA[i] = 0
+		i--
+		if *m.Follow {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x40
+	}
+	if m.TailLines == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("tailLines")
+	} else {
+		i = encodeVarintApplication(dAtA, i, uint64(*m.TailLines))
+		i--
+		dAtA[i] = 0x38
 	}
-	i--
-	dAtA[i] = 0x40
-	i = encodeVarintApplication(dAtA, i, uint64(m.TailLines))
-	i--
-	dAtA[i] = 0x38
 	if m.SinceTime != nil {
 		{
 			size, err := m.SinceTime.MarshalToSizedBuffer(dAtA[:i])
@@ -4479,14 +4627,22 @@ func (m *ApplicationPodLogsQuery) MarshalToSizedBuffer(dAtA []byte) (int, error)
 		i--
 		dAtA[i] = 0x32
 	}
-	i = encodeVarintApplication(dAtA, i, uint64(m.SinceSeconds))
-	i--
-	dAtA[i] = 0x28
-	i -= len(m.Container)
-	copy(dAtA[i:], m.Container)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Container)))
-	i--
-	dAtA[i] = 0x22
+	if m.SinceSeconds == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("sinceSeconds")
+	} else {
+		i = encodeVarintApplication(dAtA, i, uint64(*m.SinceSeconds))
+		i--
+		dAtA[i] = 0x28
+	}
+	if m.Container == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("container")
+	} else {
+		i -= len(*m.Container)
+		copy(dAtA[i:], *m.Container)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Container)))
+		i--
+		dAtA[i] = 0x22
+	}
 	if m.PodName != nil {
 		i -= len(*m.PodName)
 		copy(dAtA[i:], *m.PodName)
@@ -4494,11 +4650,15 @@ func (m *ApplicationPodLogsQuery) MarshalToSizedBuffer(dAtA []byte) (int, error)
 		i--
 		dAtA[i] = 0x1a
 	}
-	i -= len(m.Namespace)
-	copy(dAtA[i:], m.Namespace)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Namespace)))
-	i--
-	dAtA[i] = 0x12
+	if m.Namespace == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("namespace")
+	} else {
+		i -= len(*m.Namespace)
+		copy(dAtA[i:], *m.Namespace)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Namespace)))
+		i--
+		dAtA[i] = 0x12
+	}
 	if m.Name == nil {
 		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("name")
 	} else {
@@ -4535,39 +4695,59 @@ func (m *LogEntry) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
-	i -= len(m.PodName)
-	copy(dAtA[i:], m.PodName)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.PodName)))
-	i--
-	dAtA[i] = 0x2a
-	i -= len(m.TimeStampStr)
-	copy(dAtA[i:], m.TimeStampStr)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.TimeStampStr)))
-	i--
-	dAtA[i] = 0x22
-	i--
-	if m.Last {
-		dAtA[i] = 1
+	if m.PodName == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("podName")
+	} else {
+		i -= len(*m.PodName)
+		copy(dAtA[i:], *m.PodName)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.PodName)))
+		i--
+		dAtA[i] = 0x2a
+	}
+	if m.TimeStampStr == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("timeStampStr")
+	} else {
+		i -= len(*m.TimeStampStr)
+		copy(dAtA[i:], *m.TimeStampStr)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.TimeStampStr)))
+		i--
+		dAtA[i] = 0x22
+	}
+	if m.Last == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("last")
+	} else {
+		i--
+		if *m.Last {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x18
+	}
+	if m.TimeStamp == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("timeStamp")
+	} else {
+		{
+			size, err := m.TimeStamp.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintApplication(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x12
+	}
+	if m.Content == nil {
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("content")
 	} else {
-		dAtA[i] = 0
+		i -= len(*m.Content)
+		copy(dAtA[i:], *m.Content)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Content)))
+		i--
+		dAtA[i] = 0xa
 	}
-	i--
-	dAtA[i] = 0x18
-	{
-		size, err := m.TimeStamp.MarshalToSizedBuffer(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = encodeVarintApplication(dAtA, i, uint64(size))
-	}
-	i--
-	dAtA[i] = 0x12
-	i -= len(m.Content)
-	copy(dAtA[i:], m.Content)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Content)))
-	i--
-	dAtA[i] = 0xa
 	return len(dAtA) - i, nil
 }
 
@@ -4827,31 +5007,41 @@ func (m *ResourcesQuery) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
-	i -= len(m.Kind)
-	copy(dAtA[i:], m.Kind)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Kind)))
-	i--
-	dAtA[i] = 0x32
-	i -= len(m.Group)
-	copy(dAtA[i:], m.Group)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Group)))
-	i--
-	dAtA[i] = 0x2a
-	i -= len(m.Version)
-	copy(dAtA[i:], m.Version)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Version)))
-	i--
-	dAtA[i] = 0x22
-	i -= len(m.Name)
-	copy(dAtA[i:], m.Name)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Name)))
-	i--
-	dAtA[i] = 0x1a
-	i -= len(m.Namespace)
-	copy(dAtA[i:], m.Namespace)
-	i = encodeVarintApplication(dAtA, i, uint64(len(m.Namespace)))
-	i--
-	dAtA[i] = 0x12
+	if m.Kind != nil {
+		i -= len(*m.Kind)
+		copy(dAtA[i:], *m.Kind)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Kind)))
+		i--
+		dAtA[i] = 0x32
+	}
+	if m.Group != nil {
+		i -= len(*m.Group)
+		copy(dAtA[i:], *m.Group)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Group)))
+		i--
+		dAtA[i] = 0x2a
+	}
+	if m.Version != nil {
+		i -= len(*m.Version)
+		copy(dAtA[i:], *m.Version)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Version)))
+		i--
+		dAtA[i] = 0x22
+	}
+	if m.Name != nil {
+		i -= len(*m.Name)
+		copy(dAtA[i:], *m.Name)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Name)))
+		i--
+		dAtA[i] = 0x1a
+	}
+	if m.Namespace != nil {
+		i -= len(*m.Namespace)
+		copy(dAtA[i:], *m.Namespace)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Namespace)))
+		i--
+		dAtA[i] = 0x12
+	}
 	if m.ApplicationName == nil {
 		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("applicationName")
 	} else {
@@ -4936,12 +5126,18 @@ func (m *ApplicationQuery) Size() (n int) {
 			n += 1 + l + sovApplication(uint64(l))
 		}
 	}
-	l = len(m.ResourceVersion)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.Selector)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.Repo)
-	n += 1 + l + sovApplication(uint64(l))
+	if m.ResourceVersion != nil {
+		l = len(*m.ResourceVersion)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Selector != nil {
+		l = len(*m.Selector)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Repo != nil {
+		l = len(*m.Repo)
+		n += 1 + l + sovApplication(uint64(l))
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -4994,12 +5190,18 @@ func (m *ApplicationResourceEventsQuery) Size() (n int) {
 		l = len(*m.Name)
 		n += 1 + l + sovApplication(uint64(l))
 	}
-	l = len(m.ResourceNamespace)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.ResourceName)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.ResourceUID)
-	n += 1 + l + sovApplication(uint64(l))
+	if m.ResourceNamespace != nil {
+		l = len(*m.ResourceNamespace)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.ResourceName != nil {
+		l = len(*m.ResourceName)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.ResourceUID != nil {
+		l = len(*m.ResourceUID)
+		n += 1 + l + sovApplication(uint64(l))
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -5016,8 +5218,10 @@ func (m *ApplicationManifestQuery) Size() (n int) {
 		l = len(*m.Name)
 		n += 1 + l + sovApplication(uint64(l))
 	}
-	l = len(m.Revision)
-	n += 1 + l + sovApplication(uint64(l))
+	if m.Revision != nil {
+		l = len(*m.Revision)
+		n += 1 + l + sovApplication(uint64(l))
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -5042,8 +5246,10 @@ func (m *ApplicationCreateRequest) Size() (n int) {
 	}
 	var l int
 	_ = l
-	l = m.Application.Size()
-	n += 1 + l + sovApplication(uint64(l))
+	if m.Application != nil {
+		l = m.Application.Size()
+		n += 1 + l + sovApplication(uint64(l))
+	}
 	if m.Upsert != nil {
 		n += 2
 	}
@@ -5126,10 +5332,16 @@ func (m *ApplicationSyncRequest) Size() (n int) {
 		l = len(*m.Name)
 		n += 1 + l + sovApplication(uint64(l))
 	}
-	l = len(m.Revision)
-	n += 1 + l + sovApplication(uint64(l))
-	n += 2
-	n += 2
+	if m.Revision != nil {
+		l = len(*m.Revision)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.DryRun != nil {
+		n += 2
+	}
+	if m.Prune != nil {
+		n += 2
+	}
 	if m.Strategy != nil {
 		l = m.Strategy.Size()
 		n += 1 + l + sovApplication(uint64(l))
@@ -5176,8 +5388,10 @@ func (m *ApplicationUpdateSpecRequest) Size() (n int) {
 		l = len(*m.Name)
 		n += 1 + l + sovApplication(uint64(l))
 	}
-	l = m.Spec.Size()
-	n += 1 + l + sovApplication(uint64(l))
+	if m.Spec != nil {
+		l = m.Spec.Size()
+		n += 1 + l + sovApplication(uint64(l))
+	}
 	if m.Validate != nil {
 		n += 2
 	}
@@ -5197,10 +5411,14 @@ func (m *ApplicationPatchRequest) Size() (n int) {
 		l = len(*m.Name)
 		n += 1 + l + sovApplication(uint64(l))
 	}
-	l = len(m.Patch)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.PatchType)
-	n += 1 + l + sovApplication(uint64(l))
+	if m.Patch != nil {
+		l = len(*m.Patch)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.PatchType != nil {
+		l = len(*m.PatchType)
+		n += 1 + l + sovApplication(uint64(l))
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -5217,9 +5435,15 @@ func (m *ApplicationRollbackRequest) Size() (n int) {
 		l = len(*m.Name)
 		n += 1 + l + sovApplication(uint64(l))
 	}
-	n += 1 + sovApplication(uint64(m.ID))
-	n += 2
-	n += 2
+	if m.Id != nil {
+		n += 1 + sovApplication(uint64(*m.Id))
+	}
+	if m.DryRun != nil {
+		n += 2
+	}
+	if m.Prune != nil {
+		n += 2
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -5236,16 +5460,26 @@ func (m *ApplicationResourceRequest) Size() (n int) {
 		l = len(*m.Name)
 		n += 1 + l + sovApplication(uint64(l))
 	}
-	l = len(m.Namespace)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.ResourceName)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.Version)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.Group)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.Kind)
-	n += 1 + l + sovApplication(uint64(l))
+	if m.Namespace != nil {
+		l = len(*m.Namespace)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.ResourceName != nil {
+		l = len(*m.ResourceName)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Version != nil {
+		l = len(*m.Version)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Group != nil {
+		l = len(*m.Group)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Kind != nil {
+		l = len(*m.Kind)
+		n += 1 + l + sovApplication(uint64(l))
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -5262,20 +5496,34 @@ func (m *ApplicationResourcePatchRequest) Size() (n int) {
 		l = len(*m.Name)
 		n += 1 + l + sovApplication(uint64(l))
 	}
-	l = len(m.Namespace)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.ResourceName)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.Version)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.Group)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.Kind)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.Patch)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.PatchType)
-	n += 1 + l + sovApplication(uint64(l))
+	if m.Namespace != nil {
+		l = len(*m.Namespace)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.ResourceName != nil {
+		l = len(*m.ResourceName)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Version != nil {
+		l = len(*m.Version)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Group != nil {
+		l = len(*m.Group)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Kind != nil {
+		l = len(*m.Kind)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Patch != nil {
+		l = len(*m.Patch)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.PatchType != nil {
+		l = len(*m.PatchType)
+		n += 1 + l + sovApplication(uint64(l))
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -5292,16 +5540,26 @@ func (m *ApplicationResourceDeleteRequest) Size() (n int) {
 		l = len(*m.Name)
 		n += 1 + l + sovApplication(uint64(l))
 	}
-	l = len(m.Namespace)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.ResourceName)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.Version)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.Group)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.Kind)
-	n += 1 + l + sovApplication(uint64(l))
+	if m.Namespace != nil {
+		l = len(*m.Namespace)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.ResourceName != nil {
+		l = len(*m.ResourceName)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Version != nil {
+		l = len(*m.Version)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Group != nil {
+		l = len(*m.Group)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Kind != nil {
+		l = len(*m.Kind)
+		n += 1 + l + sovApplication(uint64(l))
+	}
 	if m.Force != nil {
 		n += 2
 	}
@@ -5324,18 +5582,30 @@ func (m *ResourceActionRunRequest) Size() (n int) {
 		l = len(*m.Name)
 		n += 1 + l + sovApplication(uint64(l))
 	}
-	l = len(m.Namespace)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.ResourceName)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.Version)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.Group)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.Kind)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.Action)
-	n += 1 + l + sovApplication(uint64(l))
+	if m.Namespace != nil {
+		l = len(*m.Namespace)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.ResourceName != nil {
+		l = len(*m.ResourceName)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Version != nil {
+		l = len(*m.Version)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Group != nil {
+		l = len(*m.Group)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Kind != nil {
+		l = len(*m.Kind)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Action != nil {
+		l = len(*m.Action)
+		n += 1 + l + sovApplication(uint64(l))
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -5366,8 +5636,10 @@ func (m *ApplicationResourceResponse) Size() (n int) {
 	}
 	var l int
 	_ = l
-	l = len(m.Manifest)
-	n += 1 + l + sovApplication(uint64(l))
+	if m.Manifest != nil {
+		l = len(*m.Manifest)
+		n += 1 + l + sovApplication(uint64(l))
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -5384,21 +5656,31 @@ func (m *ApplicationPodLogsQuery) Size() (n int) {
 		l = len(*m.Name)
 		n += 1 + l + sovApplication(uint64(l))
 	}
-	l = len(m.Namespace)
-	n += 1 + l + sovApplication(uint64(l))
+	if m.Namespace != nil {
+		l = len(*m.Namespace)
+		n += 1 + l + sovApplication(uint64(l))
+	}
 	if m.PodName != nil {
 		l = len(*m.PodName)
 		n += 1 + l + sovApplication(uint64(l))
 	}
-	l = len(m.Container)
-	n += 1 + l + sovApplication(uint64(l))
-	n += 1 + sovApplication(uint64(m.SinceSeconds))
+	if m.Container != nil {
+		l = len(*m.Container)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.SinceSeconds != nil {
+		n += 1 + sovApplication(uint64(*m.SinceSeconds))
+	}
 	if m.SinceTime != nil {
 		l = m.SinceTime.Size()
 		n += 1 + l + sovApplication(uint64(l))
 	}
-	n += 1 + sovApplication(uint64(m.TailLines))
-	n += 2
+	if m.TailLines != nil {
+		n += 1 + sovApplication(uint64(*m.TailLines))
+	}
+	if m.Follow != nil {
+		n += 2
+	}
 	if m.UntilTime != nil {
 		l = len(*m.UntilTime)
 		n += 1 + l + sovApplication(uint64(l))
@@ -5419,7 +5701,9 @@ func (m *ApplicationPodLogsQuery) Size() (n int) {
 		l = len(*m.ResourceName)
 		n += 1 + l + sovApplication(uint64(l))
 	}
-	n += 2
+	if m.Previous != nil {
+		n += 2
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -5432,15 +5716,25 @@ func (m *LogEntry) Size() (n int) {
 	}
 	var l int
 	_ = l
-	l = len(m.Content)
-	n += 1 + l + sovApplication(uint64(l))
-	l = m.TimeStamp.Size()
-	n += 1 + l + sovApplication(uint64(l))
-	n += 2
-	l = len(m.TimeStampStr)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.PodName)
-	n += 1 + l + sovApplication(uint64(l))
+	if m.Content != nil {
+		l = len(*m.Content)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.TimeStamp != nil {
+		l = m.TimeStamp.Size()
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Last != nil {
+		n += 2
+	}
+	if m.TimeStampStr != nil {
+		l = len(*m.TimeStampStr)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.PodName != nil {
+		l = len(*m.PodName)
+		n += 1 + l + sovApplication(uint64(l))
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -5555,16 +5849,26 @@ func (m *ResourcesQuery) Size() (n int) {
 		l = len(*m.ApplicationName)
 		n += 1 + l + sovApplication(uint64(l))
 	}
-	l = len(m.Namespace)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.Name)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.Version)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.Group)
-	n += 1 + l + sovApplication(uint64(l))
-	l = len(m.Kind)
-	n += 1 + l + sovApplication(uint64(l))
+	if m.Namespace != nil {
+		l = len(*m.Namespace)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Name != nil {
+		l = len(*m.Name)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Version != nil {
+		l = len(*m.Version)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Group != nil {
+		l = len(*m.Group)
+		n += 1 + l + sovApplication(uint64(l))
+	}
+	if m.Kind != nil {
+		l = len(*m.Kind)
+		n += 1 + l + sovApplication(uint64(l))
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -5752,7 +6056,8 @@ func (m *ApplicationQuery) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.ResourceVersion = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.ResourceVersion = &s
 			iNdEx = postIndex
 		case 5:
 			if wireType != 2 {
@@ -5784,7 +6089,8 @@ func (m *ApplicationQuery) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Selector = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Selector = &s
 			iNdEx = postIndex
 		case 6:
 			if wireType != 2 {
@@ -5816,7 +6122,8 @@ func (m *ApplicationQuery) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Repo = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Repo = &s
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
@@ -6144,7 +6451,8 @@ func (m *ApplicationResourceEventsQuery) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.ResourceNamespace = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.ResourceNamespace = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000002)
 		case 3:
@@ -6177,7 +6485,8 @@ func (m *ApplicationResourceEventsQuery) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.ResourceName = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.ResourceName = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000004)
 		case 4:
@@ -6210,7 +6519,8 @@ func (m *ApplicationResourceEventsQuery) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.ResourceUID = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.ResourceUID = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000008)
 		default:
@@ -6341,7 +6651,8 @@ func (m *ApplicationManifestQuery) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Revision = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Revision = &s
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
@@ -6478,6 +6789,9 @@ func (m *ApplicationCreateRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
+			if m.Application == nil {
+				m.Application = &v1alpha1.Application{}
+			}
 			if err := m.Application.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
@@ -6983,7 +7297,8 @@ func (m *ApplicationSyncRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Revision = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Revision = &s
 			iNdEx = postIndex
 		case 3:
 			if wireType != 0 {
@@ -7004,7 +7319,8 @@ func (m *ApplicationSyncRequest) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
-			m.DryRun = bool(v != 0)
+			b := bool(v != 0)
+			m.DryRun = &b
 		case 4:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Prune", wireType)
@@ -7024,7 +7340,8 @@ func (m *ApplicationSyncRequest) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
-			m.Prune = bool(v != 0)
+			b := bool(v != 0)
+			m.Prune = &b
 		case 5:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Strategy", wireType)
@@ -7090,7 +7407,7 @@ func (m *ApplicationSyncRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Resources = append(m.Resources, v1alpha1.SyncOperationResource{})
+			m.Resources = append(m.Resources, &v1alpha1.SyncOperationResource{})
 			if err := m.Resources[len(m.Resources)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
@@ -7351,6 +7668,9 @@ func (m *ApplicationUpdateSpecRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
+			if m.Spec == nil {
+				m.Spec = &v1alpha1.ApplicationSpec{}
+			}
 			if err := m.Spec.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
@@ -7499,7 +7819,8 @@ func (m *ApplicationPatchRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Patch = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Patch = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000002)
 		case 3:
@@ -7532,7 +7853,8 @@ func (m *ApplicationPatchRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.PatchType = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.PatchType = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000004)
 		default:
@@ -7632,9 +7954,9 @@ func (m *ApplicationRollbackRequest) Unmarshal(dAtA []byte) error {
 			hasFields[0] |= uint64(0x00000001)
 		case 2:
 			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ID", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType)
 			}
-			m.ID = 0
+			var v int64
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowApplication
@@ -7644,11 +7966,12 @@ func (m *ApplicationRollbackRequest) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				m.ID |= int64(b&0x7F) << shift
+				v |= int64(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
 			}
+			m.Id = &v
 			hasFields[0] |= uint64(0x00000002)
 		case 3:
 			if wireType != 0 {
@@ -7669,7 +7992,8 @@ func (m *ApplicationRollbackRequest) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
-			m.DryRun = bool(v != 0)
+			b := bool(v != 0)
+			m.DryRun = &b
 		case 4:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Prune", wireType)
@@ -7689,7 +8013,8 @@ func (m *ApplicationRollbackRequest) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
-			m.Prune = bool(v != 0)
+			b := bool(v != 0)
+			m.Prune = &b
 		default:
 			iNdEx = preIndex
 			skippy, err := skipApplication(dAtA[iNdEx:])
@@ -7812,7 +8137,8 @@ func (m *ApplicationResourceRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Namespace = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Namespace = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000002)
 		case 3:
@@ -7845,7 +8171,8 @@ func (m *ApplicationResourceRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.ResourceName = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.ResourceName = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000004)
 		case 4:
@@ -7878,7 +8205,8 @@ func (m *ApplicationResourceRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Version = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Version = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000008)
 		case 5:
@@ -7911,7 +8239,8 @@ func (m *ApplicationResourceRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Group = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Group = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000010)
 		case 6:
@@ -7944,7 +8273,8 @@ func (m *ApplicationResourceRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Kind = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Kind = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000020)
 		default:
@@ -8081,7 +8411,8 @@ func (m *ApplicationResourcePatchRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Namespace = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Namespace = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000002)
 		case 3:
@@ -8114,7 +8445,8 @@ func (m *ApplicationResourcePatchRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.ResourceName = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.ResourceName = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000004)
 		case 4:
@@ -8147,7 +8479,8 @@ func (m *ApplicationResourcePatchRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Version = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Version = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000008)
 		case 5:
@@ -8180,7 +8513,8 @@ func (m *ApplicationResourcePatchRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Group = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Group = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000010)
 		case 6:
@@ -8213,7 +8547,8 @@ func (m *ApplicationResourcePatchRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Kind = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Kind = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000020)
 		case 7:
@@ -8246,7 +8581,8 @@ func (m *ApplicationResourcePatchRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Patch = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Patch = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000040)
 		case 8:
@@ -8279,7 +8615,8 @@ func (m *ApplicationResourcePatchRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.PatchType = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.PatchType = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000080)
 		default:
@@ -8422,7 +8759,8 @@ func (m *ApplicationResourceDeleteRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Namespace = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Namespace = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000002)
 		case 3:
@@ -8455,7 +8793,8 @@ func (m *ApplicationResourceDeleteRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.ResourceName = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.ResourceName = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000004)
 		case 4:
@@ -8488,7 +8827,8 @@ func (m *ApplicationResourceDeleteRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Version = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Version = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000008)
 		case 5:
@@ -8521,7 +8861,8 @@ func (m *ApplicationResourceDeleteRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Group = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Group = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000010)
 		case 6:
@@ -8554,7 +8895,8 @@ func (m *ApplicationResourceDeleteRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Kind = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Kind = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000020)
 		case 7:
@@ -8733,7 +9075,8 @@ func (m *ResourceActionRunRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Namespace = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Namespace = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000002)
 		case 3:
@@ -8766,7 +9109,8 @@ func (m *ResourceActionRunRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.ResourceName = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.ResourceName = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000004)
 		case 4:
@@ -8799,7 +9143,8 @@ func (m *ResourceActionRunRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Version = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Version = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000008)
 		case 5:
@@ -8832,7 +9177,8 @@ func (m *ResourceActionRunRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Group = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Group = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000010)
 		case 6:
@@ -8865,7 +9211,8 @@ func (m *ResourceActionRunRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Kind = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Kind = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000020)
 		case 7:
@@ -8898,7 +9245,8 @@ func (m *ResourceActionRunRequest) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Action = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Action = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000040)
 		default:
@@ -9002,7 +9350,7 @@ func (m *ResourceActionsListResponse) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Actions = append(m.Actions, v1alpha1.ResourceAction{})
+			m.Actions = append(m.Actions, &v1alpha1.ResourceAction{})
 			if err := m.Actions[len(m.Actions)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
@@ -9089,7 +9437,8 @@ func (m *ApplicationResourceResponse) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Manifest = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Manifest = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000001)
 		default:
@@ -9211,7 +9560,8 @@ func (m *ApplicationPodLogsQuery) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Namespace = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Namespace = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000002)
 		case 3:
@@ -9277,14 +9627,15 @@ func (m *ApplicationPodLogsQuery) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Container = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Container = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000004)
 		case 5:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field SinceSeconds", wireType)
 			}
-			m.SinceSeconds = 0
+			var v int64
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowApplication
@@ -9294,11 +9645,12 @@ func (m *ApplicationPodLogsQuery) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				m.SinceSeconds |= int64(b&0x7F) << shift
+				v |= int64(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
 			}
+			m.SinceSeconds = &v
 			hasFields[0] |= uint64(0x00000008)
 		case 6:
 			if wireType != 2 {
@@ -9340,7 +9692,7 @@ func (m *ApplicationPodLogsQuery) Unmarshal(dAtA []byte) error {
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field TailLines", wireType)
 			}
-			m.TailLines = 0
+			var v int64
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowApplication
@@ -9350,11 +9702,12 @@ func (m *ApplicationPodLogsQuery) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				m.TailLines |= int64(b&0x7F) << shift
+				v |= int64(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
 			}
+			m.TailLines = &v
 			hasFields[0] |= uint64(0x00000010)
 		case 8:
 			if wireType != 0 {
@@ -9375,7 +9728,8 @@ func (m *ApplicationPodLogsQuery) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
-			m.Follow = bool(v != 0)
+			b := bool(v != 0)
+			m.Follow = &b
 			hasFields[0] |= uint64(0x00000020)
 		case 9:
 			if wireType != 2 {
@@ -9561,7 +9915,8 @@ func (m *ApplicationPodLogsQuery) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
-			m.Previous = bool(v != 0)
+			b := bool(v != 0)
+			m.Previous = &b
 		default:
 			iNdEx = preIndex
 			skippy, err := skipApplication(dAtA[iNdEx:])
@@ -9662,7 +10017,8 @@ func (m *LogEntry) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Content = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Content = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000001)
 		case 2:
@@ -9694,6 +10050,9 @@ func (m *LogEntry) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
+			if m.TimeStamp == nil {
+				m.TimeStamp = &v1.Time{}
+			}
 			if err := m.TimeStamp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
@@ -9718,7 +10077,8 @@ func (m *LogEntry) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
-			m.Last = bool(v != 0)
+			b := bool(v != 0)
+			m.Last = &b
 			hasFields[0] |= uint64(0x00000004)
 		case 4:
 			if wireType != 2 {
@@ -9750,7 +10110,8 @@ func (m *LogEntry) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.TimeStampStr = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.TimeStampStr = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000008)
 		case 5:
@@ -9783,7 +10144,8 @@ func (m *LogEntry) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.PodName = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.PodName = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000010)
 		default:
@@ -10479,7 +10841,8 @@ func (m *ResourcesQuery) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Namespace = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Namespace = &s
 			iNdEx = postIndex
 		case 3:
 			if wireType != 2 {
@@ -10511,7 +10874,8 @@ func (m *ResourcesQuery) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Name = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Name = &s
 			iNdEx = postIndex
 		case 4:
 			if wireType != 2 {
@@ -10543,7 +10907,8 @@ func (m *ResourcesQuery) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Version = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Version = &s
 			iNdEx = postIndex
 		case 5:
 			if wireType != 2 {
@@ -10575,7 +10940,8 @@ func (m *ResourcesQuery) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Group = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Group = &s
 			iNdEx = postIndex
 		case 6:
 			if wireType != 2 {
@@ -10607,7 +10973,8 @@ func (m *ResourcesQuery) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Kind = string(dAtA[iNdEx:postIndex])
+			s := string(dAtA[iNdEx:postIndex])
+			m.Kind = &s
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
diff --git a/pkg/apiclient/application/forwarder_overwrite.go b/pkg/apiclient/application/forwarder_overwrite.go
index 8c67679846c2d..02d2d5b2af6aa 100644
--- a/pkg/apiclient/application/forwarder_overwrite.go
+++ b/pkg/apiclient/application/forwarder_overwrite.go
@@ -33,10 +33,10 @@ func init() {
 					return
 				}
 				if logEntry, ok := msg.(*LogEntry); ok {
-					if logEntry.Last {
+					if logEntry.GetLast() {
 						return
 					}
-					if _, err = w.Write([]byte(logEntry.Content + "\n")); err != nil {
+					if _, err = w.Write([]byte(logEntry.GetContent() + "\n")); err != nil {
 						return
 					}
 				}
diff --git a/pkg/apiclient/grpcproxy.go b/pkg/apiclient/grpcproxy.go
index 61394756e4212..d416758e224ef 100644
--- a/pkg/apiclient/grpcproxy.go
+++ b/pkg/apiclient/grpcproxy.go
@@ -38,8 +38,8 @@ func (noopCodec) Unmarshal(data []byte, v interface{}) error {
 	return nil
 }
 
-func (noopCodec) String() string {
-	return "bytes"
+func (noopCodec) Name() string {
+	return "proto"
 }
 
 func toFrame(msg []byte) []byte {
@@ -107,7 +107,7 @@ func (c *client) startGRPCProxy() (*grpc.Server, net.Listener, error) {
 		return nil, nil, err
 	}
 	proxySrv := grpc.NewServer(
-		grpc.CustomCodec(&noopCodec{}),
+		grpc.ForceServerCodec(&noopCodec{}),
 		grpc.UnknownServiceHandler(func(srv interface{}, stream grpc.ServerStream) error {
 			fullMethodName, ok := grpc.MethodFromServerStream(stream)
 			if !ok {
diff --git a/reposerver/apiclient/clientset.go b/reposerver/apiclient/clientset.go
index 200a75dbe0359..f84cf77de2d5c 100644
--- a/reposerver/apiclient/clientset.go
+++ b/reposerver/apiclient/clientset.go
@@ -10,6 +10,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/insecure"
 
 	argogrpc "github.com/argoproj/argo-cd/v2/util/grpc"
 	"github.com/argoproj/argo-cd/v2/util/io"
@@ -73,7 +74,7 @@ func NewConnection(address string, timeoutSeconds int, tlsConfig *TLSConfigurati
 		}
 		opts = append(opts, grpc.WithTransportCredentials(credentials.NewTLS(tlsC)))
 	} else {
-		opts = append(opts, grpc.WithInsecure())
+		opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	}
 
 	conn, err := grpc.Dial(address, opts...)
diff --git a/server/application/application.go b/server/application/application.go
index c05c9d469e958..b6384f060623f 100644
--- a/server/application/application.go
+++ b/server/application/application.go
@@ -130,7 +130,7 @@ func appRBACName(app appv1.Application) string {
 
 // List returns list of applications
 func (s *Server) List(ctx context.Context, q *application.ApplicationQuery) (*appv1.ApplicationList, error) {
-	labelsMap, err := labels.ConvertSelectorToLabelsMap(q.Selector)
+	labelsMap, err := labels.ConvertSelectorToLabelsMap(q.GetSelector())
 	if err != nil {
 		return nil, err
 	}
@@ -155,7 +155,7 @@ func (s *Server) List(ctx context.Context, q *application.ApplicationQuery) (*ap
 	newItems = argoutil.FilterByProjects(newItems, q.Projects)
 
 	// Filter applications by source repo URL
-	newItems = argoutil.FilterByRepo(newItems, q.Repo)
+	newItems = argoutil.FilterByRepo(newItems, q.GetRepo())
 
 	// Sort found applications by name
 	sort.Slice(newItems, func(i, j int) bool {
@@ -173,23 +173,26 @@ func (s *Server) List(ctx context.Context, q *application.ApplicationQuery) (*ap
 
 // Create creates an application
 func (s *Server) Create(ctx context.Context, q *application.ApplicationCreateRequest) (*appv1.Application, error) {
-	if err := s.enf.EnforceErr(ctx.Value("claims"), rbacpolicy.ResourceApplications, rbacpolicy.ActionCreate, appRBACName(q.Application)); err != nil {
+	if q.GetApplication() == nil {
+		return nil, fmt.Errorf("error creating application: application is nil in request")
+	}
+	if err := s.enf.EnforceErr(ctx.Value("claims"), rbacpolicy.ResourceApplications, rbacpolicy.ActionCreate, appRBACName(*q.Application)); err != nil {
 		return nil, err
 	}
 
 	s.projectLock.RLock(q.Application.Spec.Project)
 	defer s.projectLock.RUnlock(q.Application.Spec.Project)
 
-	a := q.Application
+	a := q.GetApplication()
 	validate := true
 	if q.Validate != nil {
 		validate = *q.Validate
 	}
-	err := s.validateAndNormalizeApp(ctx, &a, validate)
+	err := s.validateAndNormalizeApp(ctx, a, validate)
 	if err != nil {
 		return nil, err
 	}
-	created, err := s.appclientset.ArgoprojV1alpha1().Applications(s.ns).Create(ctx, &a, metav1.CreateOptions{})
+	created, err := s.appclientset.ArgoprojV1alpha1().Applications(s.ns).Create(ctx, a, metav1.CreateOptions{})
 	if err == nil {
 		s.logAppEvent(created, ctx, argo.EventReasonResourceCreated, "created application")
 		s.waitSync(created)
@@ -214,10 +217,10 @@ func (s *Server) Create(ctx context.Context, q *application.ApplicationCreateReq
 	if q.Upsert == nil || !*q.Upsert {
 		return nil, status.Errorf(codes.InvalidArgument, "existing application spec is different, use upsert flag to force update")
 	}
-	if err := s.enf.EnforceErr(ctx.Value("claims"), rbacpolicy.ResourceApplications, rbacpolicy.ActionUpdate, appRBACName(a)); err != nil {
+	if err := s.enf.EnforceErr(ctx.Value("claims"), rbacpolicy.ResourceApplications, rbacpolicy.ActionUpdate, appRBACName(*a)); err != nil {
 		return nil, err
 	}
-	updated, err := s.updateApp(existing, &a, ctx, true)
+	updated, err := s.updateApp(existing, a, ctx, true)
 	if err != nil {
 		return nil, err
 	}
@@ -301,8 +304,8 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan
 	err = s.queryRepoServer(ctx, a, func(
 		client apiclient.RepoServerServiceClient, repo *appv1.Repository, helmRepos []*appv1.Repository, helmCreds []*appv1.RepoCreds, helmOptions *appv1.HelmOptions, kustomizeOptions *appv1.KustomizeOptions, enableGenerateManifests map[string]bool) error {
 		revision := a.Spec.Source.TargetRevision
-		if q.Revision != "" {
-			revision = q.Revision
+		if q.GetRevision() != "" {
+			revision = q.GetRevision()
 		}
 		appInstanceLabelKey, err := s.settingsMgr.GetAppInstanceLabelKey()
 		if err != nil {
@@ -380,7 +383,7 @@ func (s *Server) Get(ctx context.Context, q *application.ApplicationQuery) (*app
 	// following a Watch (which is not yet powered by an informer), and the Get must reflect what was
 	// previously seen by the client.
 	a, err := s.appclientset.ArgoprojV1alpha1().Applications(s.ns).Get(ctx, q.GetName(), metav1.GetOptions{
-		ResourceVersion: q.ResourceVersion,
+		ResourceVersion: q.GetResourceVersion(),
 	})
 
 	if err != nil {
@@ -479,7 +482,7 @@ func (s *Server) ListResourceEvents(ctx context.Context, q *application.Applicat
 	// There are two places where we get events. If we are getting application events, we query
 	// our own cluster. If it is events on a resource on an external cluster, then we query the
 	// external cluster using its rest.Config
-	if q.ResourceName == "" && q.ResourceUID == "" {
+	if q.GetResourceName() == "" && q.GetResourceUID() == "" {
 		kubeClientset = s.kubeclientset
 		namespace = a.Namespace
 		fieldSelector = fields.SelectorFromSet(map[string]string{
@@ -494,16 +497,16 @@ func (s *Server) ListResourceEvents(ctx context.Context, q *application.Applicat
 		}
 		found := false
 		for _, n := range append(tree.Nodes, tree.OrphanedNodes...) {
-			if n.ResourceRef.UID == q.ResourceUID && n.ResourceRef.Name == q.ResourceName && n.ResourceRef.Namespace == q.ResourceNamespace {
+			if n.ResourceRef.UID == q.GetResourceUID() && n.ResourceRef.Name == q.GetResourceName() && n.ResourceRef.Namespace == q.GetResourceNamespace() {
 				found = true
 				break
 			}
 		}
 		if !found {
-			return nil, status.Errorf(codes.InvalidArgument, "%s not found as part of application %s", q.ResourceName, *q.Name)
+			return nil, status.Errorf(codes.InvalidArgument, "%s not found as part of application %s", q.GetResourceName(), q.GetName())
 		}
 
-		namespace = q.ResourceNamespace
+		namespace = q.GetResourceNamespace()
 		var config *rest.Config
 		config, err = s.getApplicationClusterConfig(ctx, a)
 		if err != nil {
@@ -514,8 +517,8 @@ func (s *Server) ListResourceEvents(ctx context.Context, q *application.Applicat
 			return nil, err
 		}
 		fieldSelector = fields.SelectorFromSet(map[string]string{
-			"involvedObject.name":      q.ResourceName,
-			"involvedObject.uid":       q.ResourceUID,
+			"involvedObject.name":      q.GetResourceName(),
+			"involvedObject.uid":       q.GetResourceUID(),
 			"involvedObject.namespace": namespace,
 		}).String()
 	}
@@ -633,6 +636,9 @@ func (s *Server) Update(ctx context.Context, q *application.ApplicationUpdateReq
 
 // UpdateSpec updates an application spec and filters out any invalid parameter overrides
 func (s *Server) UpdateSpec(ctx context.Context, q *application.ApplicationUpdateSpecRequest) (*appv1.ApplicationSpec, error) {
+	if q.GetSpec() == nil {
+		return nil, fmt.Errorf("error updating application spec: spec is nil in request")
+	}
 	a, err := s.appclientset.ArgoprojV1alpha1().Applications(s.ns).Get(ctx, *q.Name, metav1.GetOptions{})
 	if err != nil {
 		return nil, err
@@ -640,7 +646,7 @@ func (s *Server) UpdateSpec(ctx context.Context, q *application.ApplicationUpdat
 	if err := s.enf.EnforceErr(ctx.Value("claims"), rbacpolicy.ResourceApplications, rbacpolicy.ActionUpdate, appRBACName(*a)); err != nil {
 		return nil, err
 	}
-	a.Spec = q.Spec
+	a.Spec = *q.GetSpec()
 	validate := true
 	if q.Validate != nil {
 		validate = *q.Validate
@@ -671,9 +677,9 @@ func (s *Server) Patch(ctx context.Context, q *application.ApplicationPatchReque
 
 	var patchApp []byte
 
-	switch q.PatchType {
+	switch q.GetPatchType() {
 	case "json", "":
-		patch, err := jsonpatch.DecodePatch([]byte(q.Patch))
+		patch, err := jsonpatch.DecodePatch([]byte(q.GetPatch()))
 		if err != nil {
 			return nil, err
 		}
@@ -682,12 +688,12 @@ func (s *Server) Patch(ctx context.Context, q *application.ApplicationPatchReque
 			return nil, err
 		}
 	case "merge":
-		patchApp, err = jsonpatch.MergePatch(jsonApp, []byte(q.Patch))
+		patchApp, err = jsonpatch.MergePatch(jsonApp, []byte(q.GetPatch()))
 		if err != nil {
 			return nil, err
 		}
 	default:
-		return nil, status.Error(codes.InvalidArgument, fmt.Sprintf("Patch type '%s' is not supported", q.PatchType))
+		return nil, status.Error(codes.InvalidArgument, fmt.Sprintf("Patch type '%s' is not supported", q.GetPatchType()))
 	}
 
 	newApp := &v1alpha1.Application{}
@@ -770,13 +776,13 @@ func (s *Server) Watch(q *application.ApplicationQuery, ws application.Applicati
 		projects[q.Projects[i]] = true
 	}
 	claims := ws.Context().Value("claims")
-	selector, err := labels.Parse(q.Selector)
+	selector, err := labels.Parse(q.GetSelector())
 	if err != nil {
 		return err
 	}
 	minVersion := 0
-	if q.ResourceVersion != "" {
-		if minVersion, err = strconv.Atoi(q.ResourceVersion); err != nil {
+	if q.GetResourceVersion() != "" {
+		if minVersion, err = strconv.Atoi(q.GetResourceVersion()); err != nil {
 			minVersion = 0
 		}
 	}
@@ -815,7 +821,7 @@ func (s *Server) Watch(q *application.ApplicationQuery, ws application.Applicati
 	// If watch API is executed for one application when emit event even if resource version is provided
 	// This is required since single app watch API is used for during operations like app syncing and it is
 	// critical to never miss events.
-	if q.ResourceVersion == "" || q.GetName() != "" {
+	if q.GetResourceVersion() == "" || q.GetName() != "" {
 		apps, err := s.appLister.List(selector)
 		if err != nil {
 			return err
@@ -966,9 +972,9 @@ func (s *Server) getAppLiveResource(ctx context.Context, action string, q *appli
 		return nil, nil, nil, err
 	}
 
-	found := tree.FindNode(q.Group, q.Kind, q.Namespace, q.ResourceName)
+	found := tree.FindNode(q.GetGroup(), q.GetKind(), q.GetNamespace(), q.GetResourceName())
 	if found == nil || found.ResourceRef.UID == "" {
-		return nil, nil, nil, status.Errorf(codes.InvalidArgument, "%s %s %s not found as part of application %s", q.Kind, q.Group, q.ResourceName, *q.Name)
+		return nil, nil, nil, status.Errorf(codes.InvalidArgument, "%s %s %s not found as part of application %s", q.GetKind(), q.GetGroup(), q.GetResourceName(), q.GetName())
 	}
 	config, err := s.getApplicationClusterConfig(ctx, a)
 	if err != nil {
@@ -984,8 +990,8 @@ func (s *Server) GetResource(ctx context.Context, q *application.ApplicationReso
 	}
 
 	// make sure to use specified resource version if provided
-	if q.Version != "" {
-		res.Version = q.Version
+	if q.GetVersion() != "" {
+		res.Version = q.GetVersion()
 	}
 	obj, err := s.kubectl.GetResource(ctx, config, res.GroupKindVersion(), res.Name, res.Namespace)
 	if err != nil {
@@ -999,7 +1005,8 @@ func (s *Server) GetResource(ctx context.Context, q *application.ApplicationReso
 	if err != nil {
 		return nil, err
 	}
-	return &application.ApplicationResourceResponse{Manifest: string(data)}, nil
+	manifest := string(data)
+	return &application.ApplicationResourceResponse{Manifest: &manifest}, nil
 }
 
 func replaceSecretValues(obj *unstructured.Unstructured) (*unstructured.Unstructured, error) {
@@ -1031,7 +1038,7 @@ func (s *Server) PatchResource(ctx context.Context, q *application.ApplicationRe
 		return nil, err
 	}
 
-	manifest, err := s.kubectl.PatchResource(ctx, config, res.GroupKindVersion(), res.Name, res.Namespace, types.PatchType(q.PatchType), []byte(q.Patch))
+	manifest, err := s.kubectl.PatchResource(ctx, config, res.GroupKindVersion(), res.Name, res.Namespace, types.PatchType(q.GetPatchType()), []byte(q.GetPatch()))
 	if err != nil {
 		// don't expose real error for secrets since it might contain secret data
 		if res.Kind == kube.SecretKind && res.Group == "" {
@@ -1047,9 +1054,10 @@ func (s *Server) PatchResource(ctx context.Context, q *application.ApplicationRe
 	if err != nil {
 		return nil, err
 	}
-	s.logAppEvent(a, ctx, argo.EventReasonResourceUpdated, fmt.Sprintf("patched resource %s/%s '%s'", q.Group, q.Kind, q.ResourceName))
+	s.logAppEvent(a, ctx, argo.EventReasonResourceUpdated, fmt.Sprintf("patched resource %s/%s '%s'", q.GetGroup(), q.GetKind(), q.GetResourceName()))
+	m := string(data)
 	return &application.ApplicationResourceResponse{
-		Manifest: string(data),
+		Manifest: &m,
 	}, nil
 }
 
@@ -1086,7 +1094,7 @@ func (s *Server) DeleteResource(ctx context.Context, q *application.ApplicationR
 	if err != nil {
 		return nil, err
 	}
-	s.logAppEvent(a, ctx, argo.EventReasonResourceDeleted, fmt.Sprintf("deleted resource %s/%s '%s'", q.Group, q.Kind, q.ResourceName))
+	s.logAppEvent(a, ctx, argo.EventReasonResourceDeleted, fmt.Sprintf("deleted resource %s/%s '%s'", q.GetGroup(), q.GetKind(), q.GetResourceName()))
 	return &application.ApplicationResponse{}, nil
 }
 
@@ -1152,10 +1160,10 @@ func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMe
 }
 
 func isMatchingResource(q *application.ResourcesQuery, key kube.ResourceKey) bool {
-	return (q.Name == "" || q.Name == key.Name) &&
-		(q.Namespace == "" || q.Namespace == key.Namespace) &&
-		(q.Group == "" || q.Group == key.Group) &&
-		(q.Kind == "" || q.Kind == key.Kind)
+	return (q.GetName() == "" || q.GetName() == key.Name) &&
+		(q.GetNamespace() == "" || q.GetNamespace() == key.Namespace) &&
+		(q.GetGroup() == "" || q.GetGroup() == key.Group) &&
+		(q.GetKind() == "" || q.GetKind() == key.Kind)
 }
 
 func (s *Server) ManagedResources(ctx context.Context, q *application.ResourcesQuery) (*application.ManagedResourcesResponse, error) {
@@ -1192,11 +1200,11 @@ func (s *Server) PodLogs(q *application.ApplicationPodLogsQuery, ws application.
 	}
 
 	var sinceSeconds, tailLines *int64
-	if q.SinceSeconds > 0 {
-		sinceSeconds = &q.SinceSeconds
+	if q.GetSinceSeconds() > 0 {
+		sinceSeconds = pointer.Int64(q.GetSinceSeconds())
 	}
-	if q.TailLines > 0 {
-		tailLines = &q.TailLines
+	if q.GetTailLines() > 0 {
+		tailLines = pointer.Int64(q.GetTailLines())
 	}
 	var untilTime *metav1.Time
 	if q.GetUntilTime() != "" {
@@ -1272,13 +1280,13 @@ func (s *Server) PodLogs(q *application.ApplicationPodLogsQuery, ws application.
 
 	for _, pod := range pods {
 		stream, err := kubeClientset.CoreV1().Pods(pod.Namespace).GetLogs(pod.Name, &v1.PodLogOptions{
-			Container:    q.Container,
-			Follow:       q.Follow,
+			Container:    q.GetContainer(),
+			Follow:       q.GetFollow(),
 			Timestamps:   true,
 			SinceSeconds: sinceSeconds,
-			SinceTime:    q.SinceTime,
+			SinceTime:    q.GetSinceTime(),
 			TailLines:    tailLines,
-			Previous:     q.Previous,
+			Previous:     q.GetPrevious(),
 		}).Stream(ws.Context())
 		podName := pod.Name
 		logStream := make(chan logEntry)
@@ -1314,18 +1322,24 @@ func (s *Server) PodLogs(q *application.ApplicationPodLogsQuery, ws application.
 						continue
 					}
 				}
+				ts := metav1.NewTime(entry.timeStamp)
 				if untilTime != nil && entry.timeStamp.After(untilTime.Time) {
 					done <- ws.Send(&application.LogEntry{
-						Last: true,
+						Last:         pointer.Bool(true),
+						PodName:      &entry.podName,
+						Content:      &entry.line,
+						TimeStampStr: pointer.String(entry.timeStamp.Format(time.RFC3339Nano)),
+						TimeStamp:    &ts,
 					})
 					return
 				} else {
 					sentCount++
 					if err := ws.Send(&application.LogEntry{
-						PodName:      entry.podName,
-						Content:      entry.line,
-						TimeStampStr: entry.timeStamp.Format(time.RFC3339Nano),
-						TimeStamp:    metav1.NewTime(entry.timeStamp),
+						PodName:      &entry.podName,
+						Content:      &entry.line,
+						TimeStampStr: pointer.String(entry.timeStamp.Format(time.RFC3339Nano)),
+						TimeStamp:    &ts,
+						Last:         pointer.Bool(false),
 					}); err != nil {
 						done <- err
 						break
@@ -1333,7 +1347,15 @@ func (s *Server) PodLogs(q *application.ApplicationPodLogsQuery, ws application.
 				}
 			}
 		}
-		done <- ws.Send(&application.LogEntry{Last: true})
+		now := time.Now()
+		nowTS := metav1.NewTime(now)
+		done <- ws.Send(&application.LogEntry{
+			Last:         pointer.Bool(true),
+			PodName:      pointer.String(""),
+			Content:      pointer.String(""),
+			TimeStampStr: pointer.String(now.Format(time.RFC3339Nano)),
+			TimeStamp:    &nowTS,
+		})
 	}()
 
 	select {
@@ -1366,10 +1388,10 @@ func isTheSelectedOne(currentNode *appv1.ResourceNode, q *application.Applicatio
 		return value
 	}
 
-	if (q.ResourceName == nil || *q.ResourceName == "" || currentNode.Name == *q.ResourceName) &&
-		(q.Kind == nil || *q.Kind == "" || currentNode.Kind == *q.Kind) &&
-		(q.Group == nil || *q.Group == "" || currentNode.Group == *q.Group) &&
-		(q.Namespace == "" || currentNode.Namespace == q.Namespace) {
+	if (q.GetResourceName() == "" || currentNode.Name == q.GetResourceName()) &&
+		(q.GetKind() == "" || currentNode.Kind == q.GetKind()) &&
+		(q.GetGroup() == "" || currentNode.Group == q.GetGroup()) &&
+		(q.GetNamespace() == "" || currentNode.Namespace == q.GetNamespace()) {
 		isTheOneMap[currentNode.UID] = true
 		return true
 	}
@@ -1426,7 +1448,7 @@ func (s *Server) Sync(ctx context.Context, syncReq *application.ApplicationSyncR
 		if err := s.enf.EnforceErr(ctx.Value("claims"), rbacpolicy.ResourceApplications, rbacpolicy.ActionOverride, appRBACName(*a)); err != nil {
 			return nil, err
 		}
-		if a.Spec.SyncPolicy != nil && a.Spec.SyncPolicy.Automated != nil && !syncReq.DryRun {
+		if a.Spec.SyncPolicy != nil && a.Spec.SyncPolicy.Automated != nil && !syncReq.GetDryRun() {
 			return nil, status.Error(codes.FailedPrecondition, "Cannot use local sync when Automatic Sync Policy is enabled unless for dry run")
 		}
 	}
@@ -1434,8 +1456,8 @@ func (s *Server) Sync(ctx context.Context, syncReq *application.ApplicationSyncR
 		return nil, status.Errorf(codes.FailedPrecondition, "application is deleting")
 	}
 	if a.Spec.SyncPolicy != nil && a.Spec.SyncPolicy.Automated != nil {
-		if syncReq.Revision != "" && syncReq.Revision != text.FirstNonEmpty(a.Spec.Source.TargetRevision, "HEAD") {
-			return nil, status.Errorf(codes.FailedPrecondition, "Cannot sync to %s: auto-sync currently set to %s", syncReq.Revision, a.Spec.Source.TargetRevision)
+		if syncReq.GetRevision() != "" && syncReq.GetRevision() != text.FirstNonEmpty(a.Spec.Source.TargetRevision, "HEAD") {
+			return nil, status.Errorf(codes.FailedPrecondition, "Cannot sync to %s: auto-sync currently set to %s", syncReq.GetRevision(), a.Spec.Source.TargetRevision)
 		}
 	}
 	revision, displayRevision, err := s.resolveRevision(ctx, a, syncReq)
@@ -1461,14 +1483,22 @@ func (s *Server) Sync(ctx context.Context, syncReq *application.ApplicationSyncR
 		return nil, status.Errorf(codes.FailedPrecondition, "Cannot use local sync when signature keys are required.")
 	}
 
+	resources := []appv1.SyncOperationResource{}
+	if syncReq.GetResources() != nil {
+		for _, r := range syncReq.GetResources() {
+			if r != nil {
+				resources = append(resources, *r)
+			}
+		}
+	}
 	op := appv1.Operation{
 		Sync: &appv1.SyncOperation{
 			Revision:     revision,
-			Prune:        syncReq.Prune,
-			DryRun:       syncReq.DryRun,
+			Prune:        syncReq.GetPrune(),
+			DryRun:       syncReq.GetDryRun(),
 			SyncOptions:  syncOptions,
 			SyncStrategy: syncReq.Strategy,
-			Resources:    syncReq.Resources,
+			Resources:    resources,
 			Manifests:    syncReq.Manifests,
 		},
 		InitiatedBy: appv1.OperationInitiator{Username: session.Username(ctx)},
@@ -1511,13 +1541,13 @@ func (s *Server) Rollback(ctx context.Context, rollbackReq *application.Applicat
 
 	var deploymentInfo *appv1.RevisionHistory
 	for _, info := range a.Status.History {
-		if info.ID == rollbackReq.ID {
+		if info.ID == rollbackReq.GetId() {
 			deploymentInfo = &info
 			break
 		}
 	}
 	if deploymentInfo == nil {
-		return nil, status.Errorf(codes.InvalidArgument, "application %s does not have deployment with id %v", a.Name, rollbackReq.ID)
+		return nil, status.Errorf(codes.InvalidArgument, "application %s does not have deployment with id %v", a.Name, rollbackReq.GetId())
 	}
 	if deploymentInfo.Source.IsZero() {
 		// Since source type was introduced to history starting with v0.12, and is now required for
@@ -1534,8 +1564,8 @@ func (s *Server) Rollback(ctx context.Context, rollbackReq *application.Applicat
 	op := appv1.Operation{
 		Sync: &appv1.SyncOperation{
 			Revision:     deploymentInfo.Revision,
-			DryRun:       rollbackReq.DryRun,
-			Prune:        rollbackReq.Prune,
+			DryRun:       rollbackReq.GetDryRun(),
+			Prune:        rollbackReq.GetPrune(),
 			SyncOptions:  syncOptions,
 			SyncStrategy: &appv1.SyncStrategy{Apply: &appv1.SyncStrategyApply{}},
 			Source:       &deploymentInfo.Source,
@@ -1543,7 +1573,7 @@ func (s *Server) Rollback(ctx context.Context, rollbackReq *application.Applicat
 	}
 	a, err = argo.SetAppOperation(appIf, *rollbackReq.Name, &op)
 	if err == nil {
-		s.logAppEvent(a, ctx, argo.EventReasonOperationStarted, fmt.Sprintf("initiated rollback to %d", rollbackReq.ID))
+		s.logAppEvent(a, ctx, argo.EventReasonOperationStarted, fmt.Sprintf("initiated rollback to %d", rollbackReq.GetId()))
 	}
 	return a, err
 }
@@ -1554,7 +1584,7 @@ func (s *Server) resolveRevision(ctx context.Context, app *appv1.Application, sy
 	if syncReq.Manifests != nil {
 		return "", "", nil
 	}
-	ambiguousRevision := syncReq.Revision
+	ambiguousRevision := syncReq.GetRevision()
 	if ambiguousRevision == "" {
 		ambiguousRevision = app.Spec.Source.TargetRevision
 	}
@@ -1657,8 +1687,12 @@ func (s *Server) ListResourceActions(ctx context.Context, q *application.Applica
 	if err != nil {
 		return nil, err
 	}
+	actionsPtr := []*appv1.ResourceAction{}
+	for _, action := range availableActions {
+		actionsPtr = append(actionsPtr, &action)
+	}
 
-	return &application.ResourceActionsListResponse{Actions: availableActions}, nil
+	return &application.ResourceActionsListResponse{Actions: actionsPtr}, nil
 }
 
 func (s *Server) getAvailableActions(resourceOverrides map[string]appv1.ResourceOverride, obj *unstructured.Unstructured) ([]appv1.ResourceAction, error) {
@@ -1690,7 +1724,7 @@ func (s *Server) RunResourceAction(ctx context.Context, q *application.ResourceA
 		Version:      q.Version,
 		Group:        q.Group,
 	}
-	actionRequest := fmt.Sprintf("%s/%s/%s/%s", rbacpolicy.ActionAction, q.Group, q.Kind, q.Action)
+	actionRequest := fmt.Sprintf("%s/%s/%s/%s", rbacpolicy.ActionAction, q.GetGroup(), q.GetKind(), q.GetAction())
 	res, config, a, err := s.getAppLiveResource(ctx, actionRequest, resourceRequest)
 	if err != nil {
 		return nil, err
@@ -1708,7 +1742,7 @@ func (s *Server) RunResourceAction(ctx context.Context, q *application.ResourceA
 	luaVM := lua.VM{
 		ResourceOverrides: resourceOverrides,
 	}
-	action, err := luaVM.GetResourceAction(liveObj, q.Action)
+	action, err := luaVM.GetResourceAction(liveObj, q.GetAction())
 	if err != nil {
 		return nil, err
 	}
@@ -1768,8 +1802,8 @@ func (s *Server) RunResourceAction(ctx context.Context, q *application.ResourceA
 		}
 	}
 
-	s.logAppEvent(a, ctx, argo.EventReasonResourceActionRan, fmt.Sprintf("ran action %s on resource %s/%s/%s", q.Action, res.Group, res.Kind, res.Name))
-	s.logResourceEvent(res, ctx, argo.EventReasonResourceActionRan, fmt.Sprintf("ran action %s", q.Action))
+	s.logAppEvent(a, ctx, argo.EventReasonResourceActionRan, fmt.Sprintf("ran action %s on resource %s/%s/%s", q.GetAction(), res.Group, res.Kind, res.Name))
+	s.logResourceEvent(res, ctx, argo.EventReasonResourceActionRan, fmt.Sprintf("ran action %s", q.GetAction()))
 	return &application.ApplicationResponse{}, nil
 }
 
diff --git a/server/application/application.proto b/server/application/application.proto
index 26ad5493377eb..d2943cd93dcf4 100644
--- a/server/application/application.proto
+++ b/server/application/application.proto
@@ -6,7 +6,6 @@ option go_package = "github.com/argoproj/argo-cd/v2/pkg/apiclient/application";
 // Application Service API performs CRUD actions against application resources
 package application;
 
-import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "k8s.io/api/core/v1/generated.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
@@ -21,13 +20,13 @@ message ApplicationQuery {
 	// forces application reconciliation if set to true
 	optional string refresh = 2;
 	// the project names to restrict returned list applications
-	repeated string project = 3 [(gogoproto.customname) = "Projects"];
+	repeated string projects = 3;
 	// when specified with a watch call, shows changes that occur after that particular version of a resource.
-	optional string resourceVersion = 4 [(gogoproto.nullable) = false];
+	optional string resourceVersion = 4;
 	// the selector to restrict returned list to applications only with matched labels
-	optional string selector = 5 [(gogoproto.nullable) = false];
+	optional string selector = 5;
 	// the repoURL to restrict returned list applications
-	optional string repo = 6 [(gogoproto.nullable) = false];
+	optional string repo = 6;
 }
 
 message NodeQuery {
@@ -45,21 +44,21 @@ message RevisionMetadataQuery{
 // ApplicationEventsQuery is a query for application resource events
 message ApplicationResourceEventsQuery {
 	required string name = 1;
-	required string resourceNamespace = 2 [(gogoproto.nullable) = false];
-	required string resourceName = 3 [(gogoproto.nullable) = false];
-	required string resourceUID = 4 [(gogoproto.nullable) = false];
+	required string resourceNamespace = 2;
+	required string resourceName = 3;
+	required string resourceUID = 4;
 }
 
 // ManifestQuery is a query for manifest resources
 message ApplicationManifestQuery {
 	required string name = 1;
-	optional string revision = 2 [(gogoproto.nullable) = false];
+	optional string revision = 2;
 }
 
 message ApplicationResponse {}
 
 message ApplicationCreateRequest {
-	required github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Application application = 1 [(gogoproto.nullable) = false];
+	required github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Application application = 1;
 	optional bool upsert = 2;
 	optional bool validate = 3;
 }
@@ -82,11 +81,11 @@ message SyncOptions {
 // ApplicationSyncRequest is a request to apply the config state to live state
 message ApplicationSyncRequest {
 	required string name = 1;
-	optional string revision = 2 [(gogoproto.nullable) = false];
-	optional bool dryRun = 3 [(gogoproto.nullable) = false];
-	optional bool prune = 4 [(gogoproto.nullable) = false];
+	optional string revision = 2;
+	optional bool dryRun = 3;
+	optional bool prune = 4;
 	optional github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.SyncStrategy strategy = 5;
-	repeated github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.SyncOperationResource resources = 7 [(gogoproto.nullable) = false];
+	repeated github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.SyncOperationResource resources = 7;
 	repeated string manifests = 8;
 	repeated github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Info infos = 9;
 	optional github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RetryStrategy retryStrategy = 10;
@@ -96,97 +95,97 @@ message ApplicationSyncRequest {
 // ApplicationUpdateSpecRequest is a request to update application spec
 message ApplicationUpdateSpecRequest {
 	required string name = 1;
-	required github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationSpec spec = 2 [(gogoproto.nullable) = false];
+	required github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationSpec spec = 2;
 	optional bool validate = 3;
 }
 
 // ApplicationPatchRequest is a request to patch an application
 message ApplicationPatchRequest {
 	required string name = 1;
-	required string patch = 2 [(gogoproto.nullable) = false];
-	required string patchType = 3 [(gogoproto.nullable) = false];
+	required string patch = 2;
+	required string patchType = 3;
 }
 
 message ApplicationRollbackRequest {
 	required string name = 1;
-	required int64 id = 2 [(gogoproto.customname) = "ID", (gogoproto.nullable) = false];
-	optional bool dryRun = 3 [(gogoproto.nullable) = false];
-	optional bool prune = 4 [(gogoproto.nullable) = false];
+	required int64 id = 2;
+	optional bool dryRun = 3;
+	optional bool prune = 4;
 }
 
 message ApplicationResourceRequest {
 	required string name = 1;
-	required string namespace = 2 [(gogoproto.nullable) = false];
-	required string resourceName = 3 [(gogoproto.nullable) = false];
-	required string version = 4 [(gogoproto.nullable) = false];
-	required string group = 5 [(gogoproto.nullable) = false];
-	required string kind = 6 [(gogoproto.nullable) = false];
+	required string namespace = 2;
+	required string resourceName = 3;
+	required string version = 4;
+	required string group = 5;
+	required string kind = 6;
 }
 
 message ApplicationResourcePatchRequest {
 	required string name = 1;
-	required string namespace = 2 [(gogoproto.nullable) = false];
-	required string resourceName = 3 [(gogoproto.nullable) = false];
-	required string version = 4 [(gogoproto.nullable) = false];
-	required string group = 5 [(gogoproto.nullable) = false];
-	required string kind = 6 [(gogoproto.nullable) = false];
-	required string patch = 7 [(gogoproto.nullable) = false];
-	required string patchType = 8 [(gogoproto.nullable) = false];
+	required string namespace = 2;
+	required string resourceName = 3;
+	required string version = 4;
+	required string group = 5;
+	required string kind = 6;
+	required string patch = 7;
+	required string patchType = 8;
 }
 
 message ApplicationResourceDeleteRequest {
 	required string name = 1;
-	required string namespace = 2 [(gogoproto.nullable) = false];
-	required string resourceName = 3 [(gogoproto.nullable) = false];
-	required string version = 4 [(gogoproto.nullable) = false];
-	required string group = 5 [(gogoproto.nullable) = false];
-	required string kind = 6 [(gogoproto.nullable) = false];
-	optional bool force = 7 [(gogoproto.nullable) = true];
-	optional bool orphan = 8 [(gogoproto.nullable) = true];
+	required string namespace = 2;
+	required string resourceName = 3;
+	required string version = 4;
+	required string group = 5;
+	required string kind = 6;
+	optional bool force = 7;
+	optional bool orphan = 8;
 }
 
 message ResourceActionRunRequest {
 	required string name = 1;
-	required string namespace = 2 [(gogoproto.nullable) = false];
-	required string resourceName = 3 [(gogoproto.nullable) = false];
-	required string version = 4 [(gogoproto.nullable) = false];
-	required string group = 5 [(gogoproto.nullable) = false];
-	required string kind = 6 [(gogoproto.nullable) = false];
-	required string action = 7 [(gogoproto.nullable) = false];
+	required string namespace = 2;
+	required string resourceName = 3;
+	required string version = 4;
+	required string group = 5;
+	required string kind = 6;
+	required string action = 7;
 }
 
 message ResourceActionsListResponse {
-	repeated github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ResourceAction actions = 1 [(gogoproto.nullable) = false];
+	repeated github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ResourceAction actions = 1;
 }
 
 message ApplicationResourceResponse {
-	required string manifest = 1 [(gogoproto.nullable) = false];
+	required string manifest = 1;
 }
 
 message ApplicationPodLogsQuery {
 	required string name = 1;
-	required string namespace = 2 [(gogoproto.nullable) = false];
+	required string namespace = 2;
 	optional string podName = 3;
-	required string container = 4 [(gogoproto.nullable) = false];
-	required int64 sinceSeconds = 5 [(gogoproto.nullable) = false];
+	required string container = 4;
+	required int64 sinceSeconds = 5;
 	optional k8s.io.apimachinery.pkg.apis.meta.v1.Time sinceTime = 6;
-	required int64 tailLines = 7 [(gogoproto.nullable) = false];
-	required bool follow = 8 [(gogoproto.nullable) = false];
+	required int64 tailLines = 7;
+	required bool follow = 8;
 	optional string untilTime = 9;
 	optional string filter = 10;
 	optional string kind = 11;
 	optional string group = 12;
 	optional string resourceName = 13 ;
-	optional bool previous = 14 [(gogoproto.nullable) = false];
+	optional bool previous = 14;
 }
 
 message LogEntry {
-	required string content = 1 [(gogoproto.nullable) = false];
+	required string content = 1;
 	// deprecated in favor of timeStampStr since meta.v1.Time don't support nano time
-	required k8s.io.apimachinery.pkg.apis.meta.v1.Time timeStamp = 2 [(gogoproto.nullable) = false, deprecated=true];
-	required bool last = 3 [(gogoproto.nullable) = false];
-	required string timeStampStr = 4 [(gogoproto.nullable) = false];
-	required string podName = 5 [(gogoproto.nullable) = false];
+	required k8s.io.apimachinery.pkg.apis.meta.v1.Time timeStamp = 2;
+	required bool last = 3;
+	required string timeStampStr = 4;
+	required string podName = 5;
 }
 
 message OperationTerminateRequest {
@@ -215,13 +214,13 @@ message OperationTerminateResponse {
 
 
 message ResourcesQuery {
-	required string applicationName = 1 [(gogoproto.nullable) = true];
+	required string applicationName = 1;
 
-	optional string namespace = 2 [(gogoproto.nullable) = false];
-	optional string name = 3 [(gogoproto.nullable) = false];
-	optional string version = 4 [(gogoproto.nullable) = false];
-	optional string group = 5 [(gogoproto.nullable) = false];
-	optional string kind = 6 [(gogoproto.nullable) = false];
+	optional string namespace = 2;
+	optional string name = 3;
+	optional string version = 4;
+	optional string group = 5;
+	optional string kind = 6;
 }
 
 message ManagedResourcesResponse {
diff --git a/server/application/application_test.go b/server/application/application_test.go
index b798dd9571c2a..136c59316b934 100644
--- a/server/application/application_test.go
+++ b/server/application/application_test.go
@@ -360,7 +360,7 @@ func TestCreateApp(t *testing.T) {
 	appServer := newTestAppServer()
 	testApp.Spec.Project = ""
 	createReq := application.ApplicationCreateRequest{
-		Application: *testApp,
+		Application: testApp,
 	}
 	app, err := appServer.Create(context.Background(), &createReq)
 	assert.NoError(t, err)
@@ -373,7 +373,7 @@ func TestCreateAppWithDestName(t *testing.T) {
 	appServer := newTestAppServer()
 	testApp := newTestAppWithDestName()
 	createReq := application.ApplicationCreateRequest{
-		Application: *testApp,
+		Application: testApp,
 	}
 	app, err := appServer.Create(context.Background(), &createReq)
 	assert.NoError(t, err)
@@ -398,7 +398,7 @@ func TestUpdateAppSpec(t *testing.T) {
 	testApp.Spec.Project = ""
 	spec, err := appServer.UpdateSpec(context.Background(), &application.ApplicationUpdateSpecRequest{
 		Name: &testApp.Name,
-		Spec: testApp.Spec,
+		Spec: &testApp.Spec,
 	})
 	assert.NoError(t, err)
 	assert.Equal(t, "default", spec.Project)
@@ -411,7 +411,7 @@ func TestDeleteApp(t *testing.T) {
 	ctx := context.Background()
 	appServer := newTestAppServer()
 	createReq := application.ApplicationCreateRequest{
-		Application: *newTestApp(),
+		Application: newTestApp(),
 	}
 	app, err := appServer.Create(ctx, &createReq)
 	assert.Nil(t, err)
@@ -511,7 +511,7 @@ func TestSyncAndTerminate(t *testing.T) {
 	testApp := newTestApp()
 	testApp.Spec.Source.RepoURL = "https://github.com/argoproj/argo-cd.git"
 	createReq := application.ApplicationCreateRequest{
-		Application: *testApp,
+		Application: testApp,
 	}
 	app, err := appServer.Create(ctx, &createReq)
 	assert.Nil(t, err)
@@ -556,7 +556,7 @@ func TestSyncHelm(t *testing.T) {
 
 	appServer.repoClientset = &mocks.Clientset{RepoServerServiceClient: fakeRepoServerClient(true)}
 
-	app, err := appServer.Create(ctx, &application.ApplicationCreateRequest{Application: *testApp})
+	app, err := appServer.Create(ctx, &application.ApplicationCreateRequest{Application: testApp})
 	assert.NoError(t, err)
 
 	app, err = appServer.Sync(ctx, &application.ApplicationSyncRequest{Name: &app.Name})
@@ -576,7 +576,7 @@ func TestSyncGit(t *testing.T) {
 	testApp.Spec.Source.RepoURL = "https://github.com/org/test"
 	testApp.Spec.Source.Path = "deploy"
 	testApp.Spec.Source.TargetRevision = "0.7.*"
-	app, err := appServer.Create(ctx, &application.ApplicationCreateRequest{Application: *testApp})
+	app, err := appServer.Create(ctx, &application.ApplicationCreateRequest{Application: testApp})
 	assert.NoError(t, err)
 	syncReq := &application.ApplicationSyncRequest{
 		Name: &app.Name,
@@ -608,7 +608,7 @@ func TestRollbackApp(t *testing.T) {
 
 	updatedApp, err := appServer.Rollback(context.Background(), &application.ApplicationRollbackRequest{
 		Name: &testApp.Name,
-		ID:   1,
+		Id:   pointer.Int64(1),
 	})
 
 	assert.Nil(t, err)
@@ -680,19 +680,19 @@ func TestAppJsonPatch(t *testing.T) {
 	appServer := newTestAppServer(testApp)
 	appServer.enf.SetDefaultRole("")
 
-	app, err := appServer.Patch(ctx, &application.ApplicationPatchRequest{Name: &testApp.Name, Patch: "garbage"})
+	app, err := appServer.Patch(ctx, &application.ApplicationPatchRequest{Name: &testApp.Name, Patch: pointer.String("garbage")})
 	assert.Error(t, err)
 	assert.Nil(t, app)
 
-	app, err = appServer.Patch(ctx, &application.ApplicationPatchRequest{Name: &testApp.Name, Patch: "[]"})
+	app, err = appServer.Patch(ctx, &application.ApplicationPatchRequest{Name: &testApp.Name, Patch: pointer.String("[]")})
 	assert.NoError(t, err)
 	assert.NotNil(t, app)
 
-	app, err = appServer.Patch(ctx, &application.ApplicationPatchRequest{Name: &testApp.Name, Patch: `[{"op": "replace", "path": "/spec/source/path", "value": "foo"}]`})
+	app, err = appServer.Patch(ctx, &application.ApplicationPatchRequest{Name: &testApp.Name, Patch: pointer.String(`[{"op": "replace", "path": "/spec/source/path", "value": "foo"}]`)})
 	assert.NoError(t, err)
 	assert.Equal(t, "foo", app.Spec.Source.Path)
 
-	app, err = appServer.Patch(ctx, &application.ApplicationPatchRequest{Name: &testApp.Name, Patch: `[{"op": "remove", "path": "/metadata/annotations/test.annotation"}]`})
+	app, err = appServer.Patch(ctx, &application.ApplicationPatchRequest{Name: &testApp.Name, Patch: pointer.String(`[{"op": "remove", "path": "/metadata/annotations/test.annotation"}]`)})
 	assert.NoError(t, err)
 	assert.NotContains(t, app.Annotations, "test.annotation")
 }
@@ -706,7 +706,7 @@ func TestAppMergePatch(t *testing.T) {
 	appServer.enf.SetDefaultRole("")
 
 	app, err := appServer.Patch(ctx, &application.ApplicationPatchRequest{
-		Name: &testApp.Name, Patch: `{"spec": { "source": { "path": "foo" } }}`, PatchType: "merge"})
+		Name: &testApp.Name, Patch: pointer.String(`{"spec": { "source": { "path": "foo" } }}`), PatchType: pointer.String("merge")})
 	assert.NoError(t, err)
 	assert.Equal(t, "foo", app.Spec.Source.Path)
 }
diff --git a/server/server.go b/server/server.go
index ad2f71649cb72..a9375bf39907d 100644
--- a/server/server.go
+++ b/server/server.go
@@ -38,6 +38,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/reflection"
 	"google.golang.org/grpc/status"
@@ -729,7 +730,7 @@ func (a *ArgoCDServer) newHTTPServer(ctx context.Context, port int, grpcWebHandl
 		dCreds := credentials.NewTLS(tlsConfig)
 		dOpts = append(dOpts, grpc.WithTransportCredentials(dCreds))
 	} else {
-		dOpts = append(dOpts, grpc.WithInsecure())
+		dOpts = append(dOpts, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	}
 
 	// HTTP 1.1+JSON Server
diff --git a/server/server_norace_test.go b/server/server_norace_test.go
index 1938486d13c49..e5f88c51cab13 100644
--- a/server/server_norace_test.go
+++ b/server/server_norace_test.go
@@ -64,12 +64,6 @@ func TestUserAgent(t *testing.T) {
 			// Accept up-to-date pre-release user-agent
 			userAgent: fmt.Sprintf("%s/%s-rc1", common.ArgoCDUserAgentName, currentVersion),
 		},
-		{
-			// Reject legacy client
-			// NOTE: after we update the grpc-go client past 1.15.0, this test will break and should be deleted
-			userAgent: " ", // need a space here since the apiclient will set the default user-agent if empty
-			errorMsg:  "unsatisfied client version constraint",
-		},
 		{
 			// Permit custom clients
 			userAgent: "foo/1.2.3",
diff --git a/test/e2e/app_management_test.go b/test/e2e/app_management_test.go
index 780035130c82b..f4ab6dfb2799a 100644
--- a/test/e2e/app_management_test.go
+++ b/test/e2e/app_management_test.go
@@ -586,11 +586,11 @@ func TestManipulateApplicationResources(t *testing.T) {
 
 			_, err = client.DeleteResource(context.Background(), &applicationpkg.ApplicationResourceDeleteRequest{
 				Name:         &app.Name,
-				Group:        deployment.GroupVersionKind().Group,
-				Kind:         deployment.GroupVersionKind().Kind,
-				Version:      deployment.GroupVersionKind().Version,
-				Namespace:    deployment.GetNamespace(),
-				ResourceName: deployment.GetName(),
+				Group:        pointer.String(deployment.GroupVersionKind().Group),
+				Kind:         pointer.String(deployment.GroupVersionKind().Kind),
+				Version:      pointer.String(deployment.GroupVersionKind().Version),
+				Namespace:    pointer.String(deployment.GetNamespace()),
+				ResourceName: pointer.String(deployment.GetName()),
 			})
 			assert.NoError(t, err)
 		}).
@@ -635,14 +635,14 @@ func TestAppWithSecrets(t *testing.T) {
 		Expect(SyncStatusIs(SyncStatusCodeSynced)).
 		And(func(app *Application) {
 			res := FailOnErr(client.GetResource(context.Background(), &applicationpkg.ApplicationResourceRequest{
-				Namespace:    app.Spec.Destination.Namespace,
-				Kind:         kube.SecretKind,
-				Group:        "",
+				Namespace:    &app.Spec.Destination.Namespace,
+				Kind:         pointer.String(kube.SecretKind),
+				Group:        pointer.String(""),
 				Name:         &app.Name,
-				Version:      "v1",
-				ResourceName: "test-secret",
+				Version:      pointer.String("v1"),
+				ResourceName: pointer.String("test-secret"),
 			})).(*applicationpkg.ApplicationResourceResponse)
-			assetSecretDataHidden(t, res.Manifest)
+			assetSecretDataHidden(t, res.GetManifest())
 
 			manifests, err := client.GetManifests(context.Background(), &applicationpkg.ApplicationManifestQuery{Name: &app.Name})
 			errors.CheckError(err)
@@ -688,7 +688,7 @@ func TestAppWithSecrets(t *testing.T) {
 			app.Spec.IgnoreDifferences = []ResourceIgnoreDifferences{{
 				Kind: kube.SecretKind, JSONPointers: []string{"/data"},
 			}}
-			FailOnErr(client.UpdateSpec(context.Background(), &applicationpkg.ApplicationUpdateSpecRequest{Name: &app.Name, Spec: app.Spec}))
+			FailOnErr(client.UpdateSpec(context.Background(), &applicationpkg.ApplicationUpdateSpecRequest{Name: &app.Name, Spec: &app.Spec}))
 		}).
 		When().
 		Refresh(RefreshTypeNormal).
@@ -905,22 +905,22 @@ func TestResourceAction(t *testing.T) {
 
 			actions, err := client.ListResourceActions(context.Background(), &applicationpkg.ApplicationResourceRequest{
 				Name:         &app.Name,
-				Group:        "apps",
-				Kind:         "Deployment",
-				Version:      "v1",
-				Namespace:    DeploymentNamespace(),
-				ResourceName: "guestbook-ui",
+				Group:        pointer.String("apps"),
+				Kind:         pointer.String("Deployment"),
+				Version:      pointer.String("v1"),
+				Namespace:    pointer.String(DeploymentNamespace()),
+				ResourceName: pointer.String("guestbook-ui"),
 			})
 			assert.NoError(t, err)
-			assert.Equal(t, []ResourceAction{{Name: "sample", Disabled: false}}, actions.Actions)
+			assert.Equal(t, []*ResourceAction{{Name: "sample", Disabled: false}}, actions.Actions)
 
 			_, err = client.RunResourceAction(context.Background(), &applicationpkg.ResourceActionRunRequest{Name: &app.Name,
-				Group:        "apps",
-				Kind:         "Deployment",
-				Version:      "v1",
-				Namespace:    DeploymentNamespace(),
-				ResourceName: "guestbook-ui",
-				Action:       "sample",
+				Group:        pointer.String("apps"),
+				Kind:         pointer.String("Deployment"),
+				Version:      pointer.String("v1"),
+				Namespace:    pointer.String(DeploymentNamespace()),
+				ResourceName: pointer.String("guestbook-ui"),
+				Action:       pointer.String("sample"),
 			})
 			assert.NoError(t, err)
 
@@ -1065,7 +1065,14 @@ func assertResourceActions(t *testing.T, appName string, successful bool) {
 	require.NoError(t, err)
 
 	logs, err := cdClient.PodLogs(context.Background(), &applicationpkg.ApplicationPodLogsQuery{
-		Group: pointer.String("apps"), Kind: pointer.String("Deployment"), Name: &appName, Namespace: DeploymentNamespace(),
+		Group:        pointer.String("apps"),
+		Kind:         pointer.String("Deployment"),
+		Name:         &appName,
+		Namespace:    pointer.String(DeploymentNamespace()),
+		Container:    pointer.String(""),
+		SinceSeconds: pointer.Int64(0),
+		TailLines:    pointer.Int64(0),
+		Follow:       pointer.Bool(false),
 	})
 	require.NoError(t, err)
 	_, err = logs.Recv()
@@ -1074,20 +1081,41 @@ func assertResourceActions(t *testing.T, appName string, successful bool) {
 	expectedError := fmt.Sprintf("Deployment apps guestbook-ui not found as part of application %s", appName)
 
 	_, err = cdClient.ListResourceEvents(context.Background(), &applicationpkg.ApplicationResourceEventsQuery{
-		Name: &appName, ResourceName: "guestbook-ui", ResourceNamespace: DeploymentNamespace(), ResourceUID: string(deploymentResource.UID)})
+		Name:              &appName,
+		ResourceName:      pointer.String("guestbook-ui"),
+		ResourceNamespace: pointer.String(DeploymentNamespace()),
+		ResourceUID:       pointer.String(string(deploymentResource.UID)),
+	})
 	assertError(err, fmt.Sprintf("%s not found as part of application %s", "guestbook-ui", appName))
 
 	_, err = cdClient.GetResource(context.Background(), &applicationpkg.ApplicationResourceRequest{
-		Name: &appName, ResourceName: "guestbook-ui", Namespace: DeploymentNamespace(), Version: "v1", Group: "apps", Kind: "Deployment"})
+		Name:         &appName,
+		ResourceName: pointer.String("guestbook-ui"),
+		Namespace:    pointer.String(DeploymentNamespace()),
+		Version:      pointer.String("v1"),
+		Group:        pointer.String("apps"),
+		Kind:         pointer.String("Deployment"),
+	})
 	assertError(err, expectedError)
 
 	_, err = cdClient.RunResourceAction(context.Background(), &applicationpkg.ResourceActionRunRequest{
-		Name: &appName, ResourceName: "guestbook-ui", Namespace: DeploymentNamespace(), Version: "v1", Group: "apps", Kind: "Deployment", Action: "restart",
+		Name:         &appName,
+		ResourceName: pointer.String("guestbook-ui"),
+		Namespace:    pointer.String(DeploymentNamespace()),
+		Version:      pointer.String("v1"),
+		Group:        pointer.String("apps"),
+		Kind:         pointer.String("Deployment"),
+		Action:       pointer.String("restart"),
 	})
 	assertError(err, expectedError)
 
 	_, err = cdClient.DeleteResource(context.Background(), &applicationpkg.ApplicationResourceDeleteRequest{
-		Name: &appName, ResourceName: "guestbook-ui", Namespace: DeploymentNamespace(), Version: "v1", Group: "apps", Kind: "Deployment",
+		Name:         &appName,
+		ResourceName: pointer.String("guestbook-ui"),
+		Namespace:    pointer.String(DeploymentNamespace()),
+		Version:      pointer.String("v1"),
+		Group:        pointer.String("apps"),
+		Kind:         pointer.String("Deployment"),
 	})
 	assertError(err, expectedError)
 }
diff --git a/util/grpc/grpc.go b/util/grpc/grpc.go
index 0575d6486e2b5..7c4a0bd0ea6f3 100644
--- a/util/grpc/grpc.go
+++ b/util/grpc/grpc.go
@@ -12,6 +12,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/keepalive"
 	"google.golang.org/grpc/status"
 )
@@ -59,9 +60,7 @@ func BlockingDial(ctx context.Context, network, address string, creds credential
 		}
 	}
 
-	dialer := func(address string, timeout time.Duration) (net.Conn, error) {
-		ctx, cancel := context.WithTimeout(ctx, timeout)
-		defer cancel()
+	dialer := func(ctx context.Context, address string) (net.Conn, error) {
 
 		conn, err := (&net.Dialer{Cancel: ctx.Done()}).Dial(network, address)
 		if err != nil {
@@ -86,8 +85,8 @@ func BlockingDial(ctx context.Context, network, address string, creds credential
 		opts = append(opts,
 			grpc.WithBlock(),
 			grpc.FailOnNonTempDialError(true),
-			grpc.WithDialer(dialer),
-			grpc.WithInsecure(), // we are handling TLS, so tell grpc not to
+			grpc.WithContextDialer(dialer),
+			grpc.WithTransportCredentials(insecure.NewCredentials()), // we are handling TLS, so tell grpc not to
 			grpc.WithKeepaliveParams(keepalive.ClientParameters{Time: 10 * time.Second}),
 		)
 		conn, err := grpc.DialContext(ctx, address, opts...)