Release 1.3.0-rc.1 (#1414 )

* Update BASE_VERSION in makefile * Updated appVersion and version tags in chart.yaml * updated tag in values.yaml * update _OM_VERSION in cloudbuild.yaml
2025-04-04 12:09:58 +00:00 · 2021-09-17 12:03:26 -04:00
93 changed files with 636 additions and 1321 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -1 +1 @@
-* @laremere @aLekSer @HazWard @calebatwd @syntxerror @sawagh @andrewgrundy @scosgrave @mridulji
+* @laremere @aLekSer @HazWard @calebatwd @syntxerror @sawagh @andrewgrundy
--- a/.github/ISSUE_TEMPLATE/bugreport.md
+++ b/.github/ISSUE_TEMPLATE/bugreport.md
@ -27,4 +27,4 @@ If the matter is security related, please disclose it privately via

 **Open Match Release Version**:

-**Install Method(yaml/helm)**:
+**Install Method(yaml/helm):**:
--- a/.github/ISSUE_TEMPLATE/release.md
+++ b/.github/ISSUE_TEMPLATE/release.md
@ -151,7 +151,6 @@ only required once.**
 - [ ] Go to the History section and find the "Post Submit" build of the merged commit that's running. Wait for it to go Green. If it's red, fix error repeat this section. Take note of the docker image version tag for next step. Example: 0.5.0-a4706cb.
 - [ ] Run `./docs/governance/templates/release.sh {source version tag} {version}` to copy the images to open-match-public-images.
 - [ ] If this is a new minor version in the newest major version then run `./docs/governance/templates/release.sh {source version tag} latest`.
- [ ] Once the images have successfully been pushed to the registry, modify the line `open-match.dev/open-match v0.0.0-dev` in all `go.mod` files in the [Tutorials] (https://github.com/googleforgames/open-match/tree/main/tutorials) directory to use the current release version. This includes all solution subdirectories as well
 - [ ] Use the files under the `build/release/` directory for the Open Match installation guide. Make sure the artifacts work as expected - these are the artifacts that will be published to the GCS bucket and used in our release assets.
 - [ ] Copy the files from `build/release/` generated from `make release` to the release draft you created.  You can drag and drop the files using the Github UI.
 - [ ] Update [Slack invitation link](https://slack.com/help/articles/201330256-invite-new-members-to-your-workspace#share-an-invite-link) in [open-match.dev](https://open-match.dev/site/docs/contribute/#get-involved).
--- a/Dockerfile.cmd
+++ b/Dockerfile.cmd
@ -18,9 +18,7 @@ WORKDIR /go/src/open-match.dev/open-match

 ARG IMAGE_TITLE

-RUN --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=cache,target=/root/.cache/go-build \
-    make "build/cmd/${IMAGE_TITLE}"
+RUN make "build/cmd/${IMAGE_TITLE}"

 FROM gcr.io/distroless/static:nonroot
 ARG IMAGE_TITLE
--- a/29
+++ b/29
@ -53,7 +53,7 @@
 # If you want information on how to edit this file checkout,
 # http://makefiletutorial.com/

-BASE_VERSION = 1.6.0
+BASE_VERSION = 1.3.0-rc.1
 SHORT_SHA = $(shell git rev-parse --short=7 HEAD | tr -d [:punct:])
 BRANCH_NAME = $(shell git rev-parse --abbrev-ref HEAD | tr -d [:punct:])
 VERSION = $(BASE_VERSION)-$(SHORT_SHA)
@ -62,7 +62,7 @@ YEAR_MONTH = $(shell date -u +'%Y%m')
 YEAR_MONTH_DAY = $(shell date -u +'%Y%m%d')
 MAJOR_MINOR_VERSION = $(shell echo $(BASE_VERSION) | cut -d '.' -f1).$(shell echo $(BASE_VERSION) | cut -d '.' -f2)
 PROTOC_VERSION = 3.10.1
-HELM_VERSION = 3.8.0
+HELM_VERSION = 3.0.0
 KUBECTL_VERSION = 1.16.2
 MINIKUBE_VERSION = latest
 GOLANGCI_VERSION = 1.18.0
@ -228,10 +228,10 @@ build-images: $(foreach IMAGE,$(IMAGES),build-$(IMAGE)-image)
 # Include all-protos here so that all dependencies are guaranteed to be downloaded after the base image is created.
 # This is important so that the repository does not have any mutations while building individual images.
 build-base-build-image: docker $(ALL_PROTOS)
-	DOCKER_BUILDKIT=1 docker build -f Dockerfile.base-build -t open-match-base-build -t $(REGISTRY)/openmatch-base-build:$(TAG) -t $(REGISTRY)/openmatch-base-build:$(ALTERNATE_TAG) .
+	docker build -f Dockerfile.base-build -t open-match-base-build -t $(REGISTRY)/openmatch-base-build:$(TAG) -t $(REGISTRY)/openmatch-base-build:$(ALTERNATE_TAG) .

 $(foreach CMD,$(CMDS),build-$(CMD)-image): build-%-image: docker build-base-build-image
-	DOCKER_BUILDKIT=1 docker build \
+	docker build \
 		-f Dockerfile.cmd \
 		$(IMAGE_BUILD_ARGS) \
 		--build-arg=IMAGE_TITLE=$* \
@ -240,10 +240,10 @@ $(foreach CMD,$(CMDS),build-$(CMD)-image): build-%-image: docker build-base-buil
 		.

 build-mmf-go-soloduel-image: docker build-base-build-image
-	DOCKER_BUILDKIT=1 docker build -f examples/functions/golang/soloduel/Dockerfile -t $(REGISTRY)/openmatch-mmf-go-soloduel:$(TAG) -t $(REGISTRY)/openmatch-mmf-go-soloduel:$(ALTERNATE_TAG) .
+	docker build -f examples/functions/golang/soloduel/Dockerfile -t $(REGISTRY)/openmatch-mmf-go-soloduel:$(TAG) -t $(REGISTRY)/openmatch-mmf-go-soloduel:$(ALTERNATE_TAG) .

 build-mmf-go-backfill-image: docker build-base-build-image
-	DOCKER_BUILDKIT=1 docker build -f examples/functions/golang/backfill/Dockerfile -t $(REGISTRY)/openmatch-mmf-go-backfill:$(TAG) -t $(REGISTRY)/openmatch-mmf-go-backfill:$(ALTERNATE_TAG) .
+	docker build -f examples/functions/golang/backfill/Dockerfile -t $(REGISTRY)/openmatch-mmf-go-backfill:$(TAG) -t $(REGISTRY)/openmatch-mmf-go-backfill:$(ALTERNATE_TAG) .

 #######################################
 ## # Builds and pushes images to your container registry.
@ -320,7 +320,7 @@ install-chart-prerequisite: build/toolchain/bin/kubectl$(EXE_EXTENSION) update-c
 	$(KUBECTL) apply -f install/gke-metadata-server-workaround.yaml

 # Used for Open Match development. Install om-configmap-override.yaml by default.
-HELM_UPGRADE_FLAGS = --cleanup-on-fail -i --no-hooks --debug --timeout=600s --namespace=$(OPEN_MATCH_KUBERNETES_NAMESPACE) --set global.gcpProjectId=$(GCP_PROJECT_ID) --set open-match-override.enabled=true --set redis.password=$(REDIS_DEV_PASSWORD) --set redis.auth.enabled=false --set redis.auth.sentinel=false
+HELM_UPGRADE_FLAGS = --cleanup-on-fail -i --no-hooks --debug --timeout=600s --namespace=$(OPEN_MATCH_KUBERNETES_NAMESPACE) --set global.gcpProjectId=$(GCP_PROJECT_ID) --set open-match-override.enabled=true --set redis.password=$(REDIS_DEV_PASSWORD) --set redis.usePassword=false --set redis.sentinel.usePassword=false
 # Used for generate static yamls. Install om-configmap-override.yaml as needed.
 HELM_TEMPLATE_FLAGS = --no-hooks --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) --set usingHelmTemplate=true
 HELM_IMAGE_FLAGS = --set global.image.registry=$(REGISTRY) --set global.image.tag=$(TAG)
@ -636,15 +636,16 @@ delete-kind-cluster: build/toolchain/bin/kind$(EXE_EXTENSION) build/toolchain/bi
 create-cluster-role-binding:
 	$(KUBECTL) create clusterrolebinding myname-cluster-admin-binding --clusterrole=cluster-admin --user=$(GCLOUD_ACCOUNT_EMAIL)

-create-gke-cluster: GKE_VERSION = 1.22.12-gke.2300 # gcloud beta container get-server-config --zone us-west1-a
+create-gke-cluster: GKE_VERSION = 1.20.8-gke.900 # gcloud beta container get-server-config --zone us-west1-a
 create-gke-cluster: GKE_CLUSTER_SHAPE_FLAGS = --machine-type n1-standard-8 --enable-autoscaling --min-nodes 1 --num-nodes 6 --max-nodes 10 --disk-size 50
 create-gke-cluster: GKE_FUTURE_COMPAT_FLAGS = --no-enable-basic-auth --no-issue-client-certificate --enable-ip-alias --metadata disable-legacy-endpoints=true --enable-autoupgrade
 create-gke-cluster: build/toolchain/bin/kubectl$(EXE_EXTENSION) gcloud
-	$(GCLOUD)  $(GCP_PROJECT_FLAG) container clusters create $(GKE_CLUSTER_NAME) $(GCP_LOCATION_FLAG) $(GKE_CLUSTER_SHAPE_FLAGS) $(GKE_FUTURE_COMPAT_FLAGS) $(GKE_CLUSTER_FLAGS) \
+	$(GCLOUD) beta $(GCP_PROJECT_FLAG) container clusters create $(GKE_CLUSTER_NAME) $(GCP_LOCATION_FLAG) $(GKE_CLUSTER_SHAPE_FLAGS) $(GKE_FUTURE_COMPAT_FLAGS) $(GKE_CLUSTER_FLAGS) \
+		--enable-pod-security-policy \
 		--cluster-version $(GKE_VERSION) \
 		--image-type cos_containerd \
 		--tags open-match \
-		--workload-pool $(GCP_PROJECT_ID).svc.id.goog
+		--workload-pool $(PROJECT_ID).svc.id.goog
 	$(MAKE) create-cluster-role-binding
 	

@ -792,7 +793,7 @@ $(foreach CMD,$(CMDS),build/cmd/$(CMD)): build/cmd/%: build/cmd/%/BUILD_PHONY bu

 build/cmd/%/BUILD_PHONY:
 	mkdir -p $(BUILD_DIR)/cmd/$*
-	CGO_ENABLED=0 $(GO) build -v -installsuffix cgo -o $(BUILD_DIR)/cmd/$*/run open-match.dev/open-match/cmd/$*
+	CGO_ENABLED=0 $(GO) build -a -installsuffix cgo -o $(BUILD_DIR)/cmd/$*/run open-match.dev/open-match/cmd/$*

 # Default is that nothing needs to be copied into the direcotry
 build/cmd/%/COPY_PHONY:
@ -863,7 +864,7 @@ ci-reap-namespaces: build/toolchain/bin/reaper$(EXE_EXTENSION)
 	-$(TOOLCHAIN_BIN)/reaper -age=30m

 # For presubmit we want to update the protobuf generated files and verify that tests are good.
-presubmit: GOLANG_TEST_COUNT = 3
+presubmit: GOLANG_TEST_COUNT = 5
 presubmit: clean third_party/ update-chart-deps assets update-deps lint build test md-test terraform-test

 build/release/: presubmit clean-install-yaml install/yaml/
@ -955,10 +956,10 @@ proxy-jaeger: build/toolchain/bin/kubectl$(EXE_EXTENSION)
 proxy-grafana: build/toolchain/bin/kubectl$(EXE_EXTENSION)
 	@echo "User: admin"
 	@echo "Password: openmatch"
-	$(KUBECTL) port-forward --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) service/$(shell $(KUBECTL) get service --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) --selector="app.kubernetes.io/name=grafana" --output jsonpath='{.items[0].metadata.name}') $(GRAFANA_PORT):3000 $(PORT_FORWARD_ADDRESS_FLAG)
+	$(KUBECTL) port-forward --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) $(shell $(KUBECTL) get pod --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) --selector="app=grafana,release=$(OPEN_MATCH_HELM_NAME)" --output jsonpath='{.items[0].metadata.name}') $(GRAFANA_PORT):3000 $(PORT_FORWARD_ADDRESS_FLAG)

 proxy-prometheus: build/toolchain/bin/kubectl$(EXE_EXTENSION)
-	$(KUBECTL) port-forward --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) service/$(shell $(KUBECTL) get service --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) --selector="app=prometheus,component=server,release=$(OPEN_MATCH_HELM_NAME)" --output jsonpath='{.items[0].metadata.name}') $(PROMETHEUS_PORT):80 $(PORT_FORWARD_ADDRESS_FLAG)
+	$(KUBECTL) port-forward --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) $(shell $(KUBECTL) get pod --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) --selector="app=prometheus,component=server,release=$(OPEN_MATCH_HELM_NAME)" --output jsonpath='{.items[0].metadata.name}') $(PROMETHEUS_PORT):9090 $(PORT_FORWARD_ADDRESS_FLAG)

 proxy-dashboard: build/toolchain/bin/kubectl$(EXE_EXTENSION)
 	$(KUBECTL) port-forward --namespace kube-system $(shell $(KUBECTL) get pod --namespace kube-system --selector="app=kubernetes-dashboard" --output jsonpath='{.items[0].metadata.name}') $(DASHBOARD_PORT):9092 $(PORT_FORWARD_ADDRESS_FLAG)
--- a/api/backend.swagger.json
+++ b/api/backend.swagger.json
@ -307,13 +307,6 @@
          },
          "description": "Customized information not inspected by Open Match, to be used by\nthe Match Function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
        },
-        "persistent_field": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be kept persistent \nthroughout the life-cycle of a backfill. \nOptional, depending on the requirements of the connected systems."
-        },
        "create_time": {
          "type": "string",
          "format": "date-time",
@ -593,13 +586,6 @@
          },
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
        },
-        "persistent_field": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be kept persistent \nthroughout the life-cycle of a ticket. \nOptional, depending on the requirements of the connected systems."
-        },
        "create_time": {
          "type": "string",
          "format": "date-time",
--- a/api/evaluator.swagger.json
+++ b/api/evaluator.swagger.json
@ -116,13 +116,6 @@
          },
          "description": "Customized information not inspected by Open Match, to be used by\nthe Match Function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
        },
-        "persistent_field": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be kept persistent \nthroughout the life-cycle of a backfill. \nOptional, depending on the requirements of the connected systems."
-        },
        "create_time": {
          "type": "string",
          "format": "date-time",
@ -244,13 +237,6 @@
          },
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
        },
-        "persistent_field": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be kept persistent \nthroughout the life-cycle of a ticket. \nOptional, depending on the requirements of the connected systems."
-        },
        "create_time": {
          "type": "string",
          "format": "date-time",
--- a/api/frontend.swagger.json
+++ b/api/frontend.swagger.json
@ -462,13 +462,6 @@
          },
          "description": "Customized information not inspected by Open Match, to be used by\nthe Match Function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
        },
-        "persistent_field": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be kept persistent \nthroughout the life-cycle of a backfill. \nOptional, depending on the requirements of the connected systems."
-        },
        "create_time": {
          "type": "string",
          "format": "date-time",
@ -551,13 +544,6 @@
          },
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
        },
-        "persistent_field": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be kept persistent \nthroughout the life-cycle of a ticket. \nOptional, depending on the requirements of the connected systems."
-        },
        "create_time": {
          "type": "string",
          "format": "date-time",
--- a/api/matchfunction.swagger.json
+++ b/api/matchfunction.swagger.json
@ -126,13 +126,6 @@
          },
          "description": "Customized information not inspected by Open Match, to be used by\nthe Match Function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
        },
-        "persistent_field": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be kept persistent \nthroughout the life-cycle of a backfill. \nOptional, depending on the requirements of the connected systems."
-        },
        "create_time": {
          "type": "string",
          "format": "date-time",
@ -363,13 +356,6 @@
          },
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
        },
-        "persistent_field": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be kept persistent \nthroughout the life-cycle of a ticket. \nOptional, depending on the requirements of the connected systems."
-        },
        "create_time": {
          "type": "string",
          "format": "date-time",
--- a/api/messages.proto
+++ b/api/messages.proto
@ -45,14 +45,9 @@ message Ticket {
  // Optional, depending on the requirements of the connected systems.
  map<string, google.protobuf.Any> extensions = 5;

-  // Customized information not inspected by Open Match, to be kept persistent 
-  // throughout the life-cycle of a ticket. 
-  // Optional, depending on the requirements of the connected systems.
-  map<string, google.protobuf.Any> persistent_field = 6;
-
  // Create time is the time the Ticket was created. It is populated by Open
  // Match at the time of Ticket creation.
-  google.protobuf.Timestamp create_time = 7;
+  google.protobuf.Timestamp create_time = 6;

  // Deprecated fields.
  reserved 2;
@ -258,17 +253,12 @@ message Backfill {
  // Optional, depending on the requirements of the connected systems.
  map<string, google.protobuf.Any> extensions = 3;

-  // Customized information not inspected by Open Match, to be kept persistent 
-  // throughout the life-cycle of a backfill. 
-  // Optional, depending on the requirements of the connected systems.
-  map<string, google.protobuf.Any> persistent_field = 4;
-
  // Create time is the time the Ticket was created. It is populated by Open
  // Match at the time of Ticket creation.
-  google.protobuf.Timestamp create_time = 5;
+  google.protobuf.Timestamp create_time = 4;

  // Generation gets incremented on GameServers update operations.
  // Prevents the MMF from overriding a newer version from the game server.
  // Do NOT read or write to this field, it is for internal tracking, and changing the value will cause bugs.
-  int64 generation = 6;
+  int64 generation = 5;
 }
--- a/api/query.swagger.json
+++ b/api/query.swagger.json
@ -224,13 +224,6 @@
          },
          "description": "Customized information not inspected by Open Match, to be used by\nthe Match Function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
        },
-        "persistent_field": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be kept persistent \nthroughout the life-cycle of a backfill. \nOptional, depending on the requirements of the connected systems."
-        },
        "create_time": {
          "type": "string",
          "format": "date-time",
@ -444,13 +437,6 @@
          },
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
        },
-        "persistent_field": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be kept persistent \nthroughout the life-cycle of a ticket. \nOptional, depending on the requirements of the connected systems."
-        },
        "create_time": {
          "type": "string",
          "format": "date-time",
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@ -164,7 +164,7 @@ artifacts:
            - install/yaml/06-open-match-override-configmap.yaml
            
 substitutions:
-    _OM_VERSION: "1.6.0"
+    _OM_VERSION: "1.3.0-rc.1"
    _GCB_POST_SUBMIT: "0"
    _GCB_LATEST_VERSION: "undefined"
    _ARTIFACTS_BUCKET: "gs://open-match-build-artifacts/output/"
--- a/go.mod
+++ b/go.mod
@ -29,7 +29,7 @@ require (
 	github.com/cenkalti/backoff v2.2.1+incompatible
 	github.com/fsnotify/fsnotify v1.4.9
 	github.com/go-redsync/redsync/v4 v4.3.0
-	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/gogo/protobuf v1.3.1 // indirect
 	github.com/golang/protobuf v1.4.3
 	github.com/gomodule/redigo v2.0.1-0.20191111085604-09d84710e01a+incompatible
 	github.com/googleapis/gnostic v0.3.1 // indirect
--- a/go.sum
+++ b/go.sum
@ -172,8 +172,8 @@ github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFG
 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=
-github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
+github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@ -319,7 +319,7 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
@ -635,7 +635,6 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 h1:OgUuv8lsRpBibGNbSizVwKWlysjaNzmC9gYMhPVfqFM=
@ -728,6 +727,7 @@ golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 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-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
@ -771,13 +771,11 @@ golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
--- a/install/helm/README.md
+++ b/install/helm/README.md
@ -26,7 +26,7 @@ swaggerui:
 global:
  kubernetes:
    service:
-     portType: ClusterIP
+-	  portType: ClusterIP
 +     portType: LoadBalancer

 # Enables grafana support in Open Match
--- a/install/helm/open-match/Chart.yaml
+++ b/install/helm/open-match/Chart.yaml
@ -13,12 +13,12 @@
 # limitations under the License.

 apiVersion: v2
-appVersion: "1.6.0"
-version: 1.6.0
+appVersion: "1.3.0-rc.1"
+version: 1.3.0-rc.1
 name: open-match
 dependencies:
  - name: redis
-    version: 16.3.1
+    version: 12.3.3
    repository: https://charts.bitnami.com/bitnami
    condition: open-match-core.redis.enabled
  - name: open-match-telemetry
--- a/install/helm/open-match/subcharts/open-match-customize/templates/evaluator.yaml
+++ b/install/helm/open-match/subcharts/open-match-customize/templates/evaluator.yaml
@ -54,7 +54,7 @@ spec:
    apiVersion: apps/v1
    kind: Deployment
    name: {{ include "openmatch.evaluator.hostName" . }}
-  {{- include "openmatch.HorizontalPodAutoscaler.evaluator.spec.common" . | nindent 2 }}
+  {{- include "openmatch.HorizontalPodAutoscaler.spec.common" . | nindent 2 }}
 ---
 apiVersion: apps/v1
 kind: Deployment
--- a/install/helm/open-match/subcharts/open-match-customize/templates/matchfunctions.yaml
+++ b/install/helm/open-match/subcharts/open-match-customize/templates/matchfunctions.yaml
@ -54,7 +54,7 @@ spec:
    apiVersion: apps/v1
    kind: Deployment
    name: {{ include "openmatchcustomize.function.hostName" . }}
-  {{- include "openmatch.HorizontalPodAutoscaler.matchfunction.spec.common" . | nindent 2 }}
+  {{- include "openmatch.HorizontalPodAutoscaler.spec.common" . | nindent 2 }}
 ---
 apiVersion: apps/v1
 kind: Deployment
--- a/install/helm/open-match/subcharts/open-match-scale/templates/scale-frontend.yaml
+++ b/install/helm/open-match/subcharts/open-match-scale/templates/scale-frontend.yaml
@ -31,7 +31,7 @@ spec:
    protocol: TCP
    port: {{ .Values.scaleFrontend.httpPort }}
 ---
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
  name: {{ include "openmatchscale.scaleFrontend.hostName" . }}
--- a/install/helm/open-match/subcharts/open-match-telemetry/Chart.yaml
+++ b/install/helm/open-match/subcharts/open-match-telemetry/Chart.yaml
@ -19,15 +19,15 @@ name: open-match-telemetry
 version: 0.0.0-dev
 dependencies:
  - name: prometheus
-    version: 15.8.7
-    repository:  https://prometheus-community.github.io/helm-charts
+    version: 9.2.0
+    repository: https://charts.helm.sh/stable
    condition: global.telemetry.prometheus.enabled,prometheus.enabled
  - name: grafana
-    version: 6.29.3
-    repository: https://grafana.github.io/helm-charts
+    version: 4.0.1
+    repository: https://charts.helm.sh/stable
    condition: global.telemetry.grafana.enabled,grafana.enabled
  - name: jaeger
-    version: 0.56.5
-    repository: https://jaegertracing.github.io/helm-charts
+    version: 0.13.3
+    repository: https://charts.helm.sh/stable
    condition: global.telemetry.jaeger.enabled,jaeger.enabled

--- a/install/helm/open-match/subcharts/open-match-telemetry/charts/grafana-3.5.7.tgz
+++ b/install/helm/open-match/subcharts/open-match-telemetry/charts/grafana-3.5.7.tgz
--- a/install/helm/open-match/subcharts/open-match-telemetry/charts/grafana-6.29.3.tgz
+++ b/install/helm/open-match/subcharts/open-match-telemetry/charts/grafana-6.29.3.tgz
--- a/install/helm/open-match/subcharts/open-match-telemetry/charts/jaeger-0.13.3.tgz
+++ b/install/helm/open-match/subcharts/open-match-telemetry/charts/jaeger-0.13.3.tgz
--- a/install/helm/open-match/subcharts/open-match-telemetry/charts/jaeger-0.56.5.tgz
+++ b/install/helm/open-match/subcharts/open-match-telemetry/charts/jaeger-0.56.5.tgz
--- a/install/helm/open-match/subcharts/open-match-telemetry/charts/prometheus-15.8.7.tgz
+++ b/install/helm/open-match/subcharts/open-match-telemetry/charts/prometheus-15.8.7.tgz
--- a/install/helm/open-match/subcharts/open-match-telemetry/charts/prometheus-8.14.0.tgz
+++ b/install/helm/open-match/subcharts/open-match-telemetry/charts/prometheus-8.14.0.tgz
--- a/install/helm/open-match/subcharts/open-match-telemetry/dashboards/match-making.json
+++ b/install/helm/open-match/subcharts/open-match-telemetry/dashboards/match-making.json
--- a/install/helm/open-match/subcharts/open-match-telemetry/templates/default-grafana-dashboards.yaml
+++ b/install/helm/open-match/subcharts/open-match-telemetry/templates/default-grafana-dashboards.yaml
@ -13,20 +13,12 @@
 # limitations under the License.

 {{- if .Values.global.telemetry.grafana.enabled }}
-{{- $om := (include "openmatch.fullname" .) }}
-{{ $c := 1 | int }}
-{{- range $path, $bytes := .Files.Glob "dashboards/*.json" }}
-{{- $ext := ext $path }}
-{{- $file := base $path }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ printf "%s-%s-dashboard" $om ((printf "%s" $file) | replace $ext "") }} 
+  name: {{ include "openmatch.fullname" . }}-dashboards
  labels:
-    grafana_dashboard: {{ printf "d-%d" $c }}
+     grafana_dashboard: "1"
 data:
-  {{- ($.Files.Glob (printf "dashboards/%s" $file)).AsConfig | nindent 2 }}
---
-{{ $c = add1 $c }}
-{{- end }}
+  {{- (.Files.Glob "dashboards/*.json").AsConfig | nindent 2 }}
 {{- end }}
--- a/install/helm/open-match/templates/_helpers.tpl
+++ b/install/helm/open-match/templates/_helpers.tpl
@ -102,14 +102,14 @@ resources:
 {{- end -}}

 {{- define "openmatch.volumemounts.withredis" -}}
-{{- if .Values.redis.auth.enabled }}
+{{- if .Values.redis.usePassword }}
 - name: redis-password
  mountPath: {{ .Values.redis.secretMountPath }}
 {{- end -}}
 {{- end -}}

 {{- define "openmatch.volumes.withredis" -}}
-{{- if .Values.redis.auth.enabled	 }}
+{{- if .Values.redis.usePassword }}
 - name: redis-password
  secret:
    secretName: {{ include "call-nested" (list . "redis" "redis.fullname") }}
@ -150,46 +150,16 @@ readinessProbe:
  failureThreshold: 2
 {{- end -}}

-{{- define "openmatch.HorizontalPodAutoscaler.frontend.spec.common" -}}
-minReplicas: {{ .Values.global.kubernetes.horizontalPodAutoScaler.frontend.minReplicas }}
-maxReplicas: {{ .Values.global.kubernetes.horizontalPodAutoScaler.frontend.maxReplicas }}
-targetCPUUtilizationPercentage: {{ .Values.global.kubernetes.horizontalPodAutoScaler.frontend.targetCPUUtilizationPercentage }}
-{{- end -}}
-
-{{- define "openmatch.HorizontalPodAutoscaler.backend.spec.common" -}}
-minReplicas: {{ .Values.global.kubernetes.horizontalPodAutoScaler.backend.minReplicas }}
-maxReplicas: {{ .Values.global.kubernetes.horizontalPodAutoScaler.backend.maxReplicas }}
-targetCPUUtilizationPercentage: {{ .Values.global.kubernetes.horizontalPodAutoScaler.backend.targetCPUUtilizationPercentage }}
-{{- end -}}
-
-{{- define "openmatch.HorizontalPodAutoscaler.query.spec.common" -}}
-minReplicas: {{ .Values.global.kubernetes.horizontalPodAutoScaler.query.minReplicas }}
-maxReplicas: {{ .Values.global.kubernetes.horizontalPodAutoScaler.query.maxReplicas }}
-targetCPUUtilizationPercentage: {{ .Values.global.kubernetes.horizontalPodAutoScaler.query.targetCPUUtilizationPercentage }}
-{{- end -}}
-
-{{- define "openmatch.HorizontalPodAutoscaler.evaluator.spec.common" -}}
-minReplicas: {{ .Values.global.kubernetes.horizontalPodAutoScaler.evaluator.minReplicas }}
-maxReplicas: {{ .Values.global.kubernetes.horizontalPodAutoScaler.evaluator.maxReplicas }}
-targetCPUUtilizationPercentage: {{ .Values.global.kubernetes.horizontalPodAutoScaler.evaluator.targetCPUUtilizationPercentage }}
-{{- end -}}
-
-{{- define "openmatch.HorizontalPodAutoscaler.matchfunction.spec.common" -}}
-minReplicas: {{ .Values.global.kubernetes.horizontalPodAutoScaler.matchfunction.minReplicas }}
-maxReplicas: {{ .Values.global.kubernetes.horizontalPodAutoScaler.matchfunction.maxReplicas }}
-targetCPUUtilizationPercentage: {{ .Values.global.kubernetes.horizontalPodAutoScaler.matchfunction.targetCPUUtilizationPercentage }}
+{{- define "openmatch.HorizontalPodAutoscaler.spec.common" -}}
+minReplicas: {{ .Values.global.kubernetes.horizontalPodAutoScaler.minReplicas }}
+maxReplicas: {{ .Values.global.kubernetes.horizontalPodAutoScaler.maxReplicas }}
+targetCPUUtilizationPercentage: {{ .Values.global.kubernetes.horizontalPodAutoScaler.targetCPUUtilizationPercentage }}
 {{- end -}}

 {{- define "openmatch.serviceAccount.name" -}}
 {{- .Values.global.kubernetes.serviceAccount | default (printf "%s-unprivileged-service" (include "openmatch.fullname" . ) ) -}}
 {{- end -}}

-{{- define "openmatch.serviceAccountAnnotations" -}}
-{{- if .Values.global.kubernetes.serviceAccountAnnotations -}}
-{{- toYaml (.Values.global.kubernetes.serviceAccountAnnotations) | nindent 4 -}}
-{{- end -}}
-{{- end -}}
-
 {{- define "openmatch.swaggerui.hostName" -}}
 {{- .Values.swaggerui.hostName | default (printf "%s-swaggerui" (include "openmatch.fullname" . ) ) -}}
 {{- end -}}
@ -253,4 +223,4 @@ https://github.com/helm/helm/issues/4535#issuecomment-477778391
 {{- $values = index $values . }}
 {{- end }}
 {{- include $template (dict "Chart" (dict "Name" (last $subchart)) "Values" $values "Release" $dot.Release "Capabilities" $dot.Capabilities) }}
-{{- end }}
+{{- end }}
--- a/install/helm/open-match/templates/backend.yaml
+++ b/install/helm/open-match/templates/backend.yaml
@ -51,7 +51,7 @@ spec:
    apiVersion: apps/v1
    kind: Deployment
    name: {{ include "openmatch.backend.hostName" . }}
-  {{- include "openmatch.HorizontalPodAutoscaler.backend.spec.common" . | nindent 2 }}
+  {{- include "openmatch.HorizontalPodAutoscaler.spec.common" . | nindent 2 }}
 ---
 apiVersion: apps/v1
 kind: Deployment
--- a/install/helm/open-match/templates/frontend.yaml
+++ b/install/helm/open-match/templates/frontend.yaml
@ -51,7 +51,7 @@ spec:
    apiVersion: apps/v1
    kind: Deployment
    name: {{ include "openmatch.frontend.hostName" . }}
-  {{- include "openmatch.HorizontalPodAutoscaler.frontend.spec.common" . | nindent 2 }}
+  {{- include "openmatch.HorizontalPodAutoscaler.spec.common" . | nindent 2 }}
 ---
 apiVersion: apps/v1
 kind: Deployment
--- a/install/helm/open-match/templates/om-configmap-default.yaml
+++ b/install/helm/open-match/templates/om-configmap-default.yaml
@ -90,11 +90,11 @@ data:
 {{- if index .Values "redis" "sentinel" "enabled"}}
      sentinelPort: {{ .Values.redis.sentinel.port }}
      sentinelMaster: {{ .Values.redis.sentinel.masterSet }}
-      sentinelHostname: {{ include "call-nested" (list . "redis" "common.names.fullname") }}
-      sentinelUsePassword: {{ .Values.redis.auth.sentinel }}
+      sentinelHostname: {{ include "call-nested" (list . "redis" "redis.fullname") }}
+      sentinelUsePassword: {{ .Values.redis.sentinel.usePassword }}
 {{- else}}
      # Open Match's default Redis setups
-      hostname: {{ include "call-nested" (list . "redis" "common.names.fullname") }}-master.{{ .Release.Namespace }}.svc.cluster.local
+      hostname: {{ include "call-nested" (list . "redis" "redis.fullname") }}-master.{{ .Release.Namespace }}.svc.cluster.local
      port: {{ .Values.redis.redisPort }}
      user: {{ .Values.redis.user }}
 {{- end}}
@ -104,7 +104,7 @@ data:
      port: {{ index .Values "open-match-core" "redis" "port" }}
      user: {{ index .Values "open-match-core" "redis" "user" }}
 {{- end }}
-      usePassword: {{ .Values.redis.auth.enabled }}
+      usePassword: {{ .Values.redis.usePassword }}
      passwordPath: {{ .Values.redis.secretMountPath }}/redis-password
      pool:
        maxIdle: {{ index .Values "open-match-core" "redis" "pool" "maxIdle" }}
--- a/install/helm/open-match/templates/om-configmap-override.yaml
+++ b/install/helm/open-match/templates/om-configmap-override.yaml
@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-{{- if index .Values "open-match-override" "enabled" }}
+{{- if index .Values "open-match-override" }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
--- a/install/helm/open-match/templates/query.yaml
+++ b/install/helm/open-match/templates/query.yaml
@ -51,7 +51,7 @@ spec:
    apiVersion: apps/v1
    kind: Deployment
    name: {{ include "openmatch.query.hostName" . }}
-  {{- include "openmatch.HorizontalPodAutoscaler.query.spec.common" . | nindent 2 }}
+  {{- include "openmatch.HorizontalPodAutoscaler.spec.common" . | nindent 2 }}
 ---
 apiVersion: apps/v1
 kind: Deployment
--- a/install/helm/open-match/templates/service-account.yaml
+++ b/install/helm/open-match/templates/service-account.yaml
@ -31,9 +31,7 @@ kind: ServiceAccount
 metadata:
  name: {{ include "openmatch.serviceAccount.name" . }}
  namespace: {{ .Release.Namespace }}
-  annotations:
-    {{- include "openmatch.chartmeta" . | nindent 4 }}
-    {{- include "openmatch.serviceAccountAnnotations" . }}
+  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
    app: {{ template "openmatch.name" . }}
    release: {{ .Release.Name }}
--- a/install/helm/open-match/templates/tests/om-test.yaml
+++ b/install/helm/open-match/templates/tests/om-test.yaml
@ -91,7 +91,7 @@ spec:
    command: ["go"]
    args:
    - "test"
-    - "./testing/e2e"
+    - "./internal/testing/e2e"
    - "-v"
    - "-timeout"
    - "150s"
--- a/install/helm/open-match/values-production.yaml
+++ b/install/helm/open-match/values-production.yaml
@ -107,10 +107,8 @@ configs:
 # https://github.com/helm/charts/tree/master/stable/redis
 redis:
  redisPort: 6379
-  auth:
-    enabled: false
-    sentinel: false
-    usePasswordFiles: false
+  usePassword: false
+  usePasswordFile: false
  secretMountPath: /opt/bitnami/redis/secrets
  configmap: |
    maxclients 100000
@ -132,11 +130,11 @@ redis:
      enabled: false
  metrics:
    enabled: true
+  cluster:
+    slaveCount: 3
  serviceAccount:
    create: true
-  replica:
-    disableCommands: [] # don't disable 'FLUSH-' commands
-    replicaCount: 3
+  slave:
    persistence:
      enabled: false
    resources:
@ -230,10 +228,6 @@ open-match-customize:
  # function:
  #   image: [YOUR_MMF_IMAGE]

-# Controls if users need to install open-match-override ConfigMap.
-open-match-override:
-  enabled: false
-
 # Global configurations that are visible to all subcharts
 global:
  kubernetes:
@ -244,26 +238,9 @@ global:
    # https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
    affinity: {}
    horizontalPodAutoScaler:
-      frontend:
-        minReplicas: 3
-        maxReplicas: 10
-        targetCPUUtilizationPercentage: 60
-      backend:
-        minReplicas: 3
-        maxReplicas: 10
-        targetCPUUtilizationPercentage: 60
-      query:
-        minReplicas: 5
-        maxReplicas: 10
-        targetCPUUtilizationPercentage: 60
-      evaluator:
-        minReplicas: 3
-        maxReplicas: 10
-        targetCPUUtilizationPercentage: 60
-      matchfunction:
-        minReplicas: 3
-        maxReplicas: 10
-        targetCPUUtilizationPercentage: 60
+      minReplicas: 3
+      maxReplicas: 10
+      targetCPUUtilizationPercentage: 60
    resources:
      requests:
        memory: 1.5Gi
@ -273,8 +250,6 @@ global:
        cpu: 2
    # Overrides the name of the service account which provides an identity for processes that run in a Pod in Open Match.
    serviceAccount:
-    # Adds custom annotations to the Open Match service account.
-    serviceAccountAnnotations: {}
    # Use this field if you need to override the port type for all services defined in this chart
    service:
      portType:
@ -296,7 +271,7 @@ global:
  # Use this field if you need to override the image registry and image tag for all services defined in this chart
  image:
    registry: gcr.io/open-match-public-images
-    tag: 1.6.0
+    tag: 0.0.0-dev
    pullPolicy: Always

  # Expose the telemetry configurations to all subcharts because prometheus, for example,
--- a/install/helm/open-match/values.yaml
+++ b/install/helm/open-match/values.yaml
@ -107,10 +107,8 @@ configs:
 # https://github.com/helm/charts/tree/master/stable/redis
 redis:
  redisPort: 6379
-  auth:
-    enabled: false
-    sentinel: false
-    usePasswordFiles: false
+  usePassword: false
+  usePasswordFile: false
  secretMountPath: /opt/bitnami/redis/secrets
  configmap: |
    maxclients 100000
@ -119,29 +117,17 @@ redis:
    enabled: true
    masterSet: om-redis-master
    port: 26379
-    resources:
-      requests:
-        memory: 300Mi
-        cpu: 0.5
+    usePassword: false
  master:
    disableCommands: [] # don't disable 'FLUSH-' commands
    resources:
      requests:
        memory: 300Mi
        cpu: 0.5
-  replica:
-    disableCommands: [] # don't disable 'FLUSH-' commands
-    replicaCount: 3
-    resources:
-      requests:
-        memory: 300Mi
-        cpu: 0.5
  metrics:
    enabled: true
-    resources:
-      requests:
-        memory: 300Mi
-        cpu: 0.5
+  cluster:
+    slaveCount: 2
  serviceAccount:
    create: true
  sysctlImage:
@ -228,10 +214,6 @@ open-match-customize:
  # function:
  #   image: [YOUR_MMF_IMAGE]

-# Controls if users need to install open-match-override ConfigMap.
-open-match-override:
-  enabled: false
-
 # Global configurations that are visible to all subcharts
 global:
  kubernetes:
@ -242,26 +224,9 @@ global:
    # https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
    affinity: {}
    horizontalPodAutoScaler:
-      frontend:
-        minReplicas: 1
-        maxReplicas: 10
-        targetCPUUtilizationPercentage: 80
-      backend:
-        minReplicas: 1
-        maxReplicas: 10
-        targetCPUUtilizationPercentage: 80
-      query:
-        minReplicas: 3
-        maxReplicas: 10
-        targetCPUUtilizationPercentage: 80
-      evaluator:
-        minReplicas: 1
-        maxReplicas: 10
-        targetCPUUtilizationPercentage: 80
-      matchfunction:
-        minReplicas: 1
-        maxReplicas: 10
-        targetCPUUtilizationPercentage: 80
+      minReplicas: 1
+      maxReplicas: 10
+      targetCPUUtilizationPercentage: 80
    resources:
      requests:
        memory: 100Mi
@ -271,8 +236,6 @@ global:
        cpu: 100m
    # Overrides the name of the service account which provides an identity for processes that run in a Pod in Open Match.
    serviceAccount:
-    # Adds custom annotations to the Open Match service account.
-    serviceAccountAnnotations: {}
    # Use this field if you need to override the port type for all services defined in this chart
    service:
      portType:
@ -294,7 +257,7 @@ global:
  # Use this field if you need to override the image registry and image tag for all services defined in this chart
  image:
    registry: gcr.io/open-match-public-images
-    tag: 1.6.0
+    tag: 1.3.0-rc.1
    pullPolicy: Always

  # Expose the telemetry configurations to all subcharts because prometheus, for example,
--- a/internal/app/frontend/frontend_service.go
+++ b/internal/app/frontend/frontend_service.go
@ -183,7 +183,6 @@ func (s *frontendService) UpdateBackfill(ctx context.Context, req *pb.UpdateBack
 	// Update generation here, because Frontend is used by GameServer only
 	bfStored.SearchFields = backfill.SearchFields
 	bfStored.Extensions = backfill.Extensions
-	bfStored.PersistentField = backfill.PersistentField
 	// Autoincrement generation, input backfill generation validation is performed
 	// on Backend only (after MMF round)
 	bfStored.Generation++
@ -228,7 +227,6 @@ func (s *frontendService) DeleteBackfill(ctx context.Context, req *pb.DeleteBack
 // DeleteTicket immediately stops Open Match from using the Ticket for matchmaking and removes the Ticket from state storage.
 // The client must delete the Ticket when finished matchmaking with it.
 //   - If SearchFields exist in a Ticket, DeleteTicket will deindex the fields lazily.
-//
 // Users may still be able to assign/get a ticket after calling DeleteTicket on it.
 func (s *frontendService) DeleteTicket(ctx context.Context, req *pb.DeleteTicketRequest) (*empty.Empty, error) {
 	err := doDeleteTicket(ctx, req.GetTicketId(), s.store)
@ -279,37 +277,39 @@ func (s *frontendService) GetTicket(ctx context.Context, req *pb.GetTicketReques
 //   - If the Assignment is not updated, GetAssignment will retry using the configured backoff strategy.
 func (s *frontendService) WatchAssignments(req *pb.WatchAssignmentsRequest, stream pb.FrontendService_WatchAssignmentsServer) error {
 	ctx := stream.Context()
-	sender := func(assignment *pb.Assignment) error {
-		return stream.Send(&pb.WatchAssignmentsResponse{Assignment: assignment})
+	for {
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+		default:
+			sender := func(assignment *pb.Assignment) error {
+				return stream.Send(&pb.WatchAssignmentsResponse{Assignment: assignment})
+			}
+			return doWatchAssignments(ctx, req.GetTicketId(), sender, s.store)
+		}
 	}
-	return doWatchAssignments(ctx, req.GetTicketId(), sender, s.store)
 }

 func doWatchAssignments(ctx context.Context, id string, sender func(*pb.Assignment) error, store statestore.Service) error {
 	var currAssignment *pb.Assignment
 	var ok bool
 	callback := func(assignment *pb.Assignment) error {
-		select {
-		case <-ctx.Done():
+		if ctx.Err() != nil {
 			return status.Errorf(codes.Aborted, ctx.Err().Error())
-		default:
-			if ctx.Err() != nil {
-				return status.Errorf(codes.Aborted, ctx.Err().Error())
-			}
-
-			if (currAssignment == nil && assignment != nil) || !proto.Equal(currAssignment, assignment) {
-				currAssignment, ok = proto.Clone(assignment).(*pb.Assignment)
-				if !ok {
-					return status.Error(codes.Internal, "failed to cast the assignment object")
-				}
-
-				err := sender(currAssignment)
-				if err != nil {
-					return status.Errorf(codes.Aborted, err.Error())
-				}
-			}
-			return nil
 		}
+
+		if (currAssignment == nil && assignment != nil) || !proto.Equal(currAssignment, assignment) {
+			currAssignment, ok = proto.Clone(assignment).(*pb.Assignment)
+			if !ok {
+				return status.Error(codes.Internal, "failed to cast the assignment object")
+			}
+
+			err := sender(currAssignment)
+			if err != nil {
+				return status.Errorf(codes.Aborted, err.Error())
+			}
+		}
+		return nil
 	}

 	return store.GetAssignments(ctx, id, callback)
--- a/internal/app/query/cache.go
+++ b/internal/app/query/cache.go
@ -177,10 +177,8 @@ func updateTicketCache(store statestore.Service, value interface{}) error {
 	}

 	stats.Record(context.Background(), cacheTotalItems.M(int64(previousCount)))
-	stats.Record(context.Background(), totalActiveTickets.M(int64(len(currentAll))))
 	stats.Record(context.Background(), cacheFetchedItems.M(int64(len(toFetch))))
 	stats.Record(context.Background(), cacheUpdateLatency.M(float64(time.Since(t))/float64(time.Millisecond)))
-	stats.Record(context.Background(), totalPendingTickets.M(int64(len(toFetch))))

 	logger.Debugf("Ticket Cache update: Previous %d, Deleted %d, Fetched %d, Current %d", previousCount, deletedCount, len(toFetch), len(tickets))
 	return nil
@ -244,7 +242,6 @@ func updateBackfillCache(store statestore.Service, value interface{}) error {
 	}

 	stats.Record(context.Background(), cacheTotalItems.M(int64(previousCount)))
-	stats.Record(context.Background(), totalBackfillsTickets.M(int64(len(backfills))))
 	stats.Record(context.Background(), cacheFetchedItems.M(int64(len(toFetch))))
 	stats.Record(context.Background(), cacheUpdateLatency.M(float64(time.Since(t))/float64(time.Millisecond)))

--- a/internal/app/query/query.go
+++ b/internal/app/query/query.go
@ -25,15 +25,12 @@ import (
 )

 var (
-	ticketsPerQuery       = stats.Int64("open-match.dev/query/tickets_per_query", "Number of tickets per query", stats.UnitDimensionless)
-	totalActiveTickets    = stats.Int64("open-match.dev/query/total_active_tickets", "Number of tickets", stats.UnitDimensionless)
-	backfillsPerQuery     = stats.Int64("open-match.dev/query/backfills_per_query", "Number of backfills per query", stats.UnitDimensionless)
-	totalBackfillsTickets = stats.Int64("open-match.dev/query/total_backfill_tickets", "Number of current backfills", stats.UnitDimensionless)
-	totalPendingTickets   = stats.Int64("open-match.dev/query/tickets_pending_release", "Number of tickets per query", stats.UnitDimensionless)
-	cacheTotalItems       = stats.Int64("open-match.dev/query/total_cache_items", "Total number of items query service cached", stats.UnitDimensionless)
-	cacheFetchedItems     = stats.Int64("open-match.dev/query/fetched_items", "Number of fetched items in total", stats.UnitDimensionless)
-	cacheWaitingQueries   = stats.Int64("open-match.dev/query/waiting_queries", "Number of waiting queries in the last update", stats.UnitDimensionless)
-	cacheUpdateLatency    = stats.Float64("open-match.dev/query/update_latency", "Time elapsed of each query cache update", stats.UnitMilliseconds)
+	ticketsPerQuery     = stats.Int64("open-match.dev/query/tickets_per_query", "Number of tickets per query", stats.UnitDimensionless)
+	backfillsPerQuery   = stats.Int64("open-match.dev/query/backfills_per_query", "Number of backfills per query", stats.UnitDimensionless)
+	cacheTotalItems     = stats.Int64("open-match.dev/query/total_cache_items", "Total number of items query service cached", stats.UnitDimensionless)
+	cacheFetchedItems   = stats.Int64("open-match.dev/query/fetched_items", "Number of fetched items in total", stats.UnitDimensionless)
+	cacheWaitingQueries = stats.Int64("open-match.dev/query/waiting_queries", "Number of waiting queries in the last update", stats.UnitDimensionless)
+	cacheUpdateLatency  = stats.Float64("open-match.dev/query/update_latency", "Time elapsed of each query cache update", stats.UnitMilliseconds)

 	ticketsPerQueryView = &view.View{
 		Measure:     ticketsPerQuery,
@ -41,30 +38,12 @@ var (
 		Description: "Tickets per query",
 		Aggregation: telemetry.DefaultCountDistribution,
 	}
-	ticketsActiveTotalView = &view.View{
-		Measure:     totalActiveTickets,
-		Name:        "open-match.dev/query/total_active_tickets",
-		Description: "Total tickets",
-		Aggregation: view.LastValue(),
-	}
 	backfillsPerQueryView = &view.View{
 		Measure:     ticketsPerQuery,
 		Name:        "open-match.dev/query/backfills_per_query",
 		Description: "Backfills per query",
 		Aggregation: telemetry.DefaultCountDistribution,
 	}
-	backfillTotalTicketsView = &view.View{
-		Measure:     totalBackfillsTickets,
-		Name:        "open-match.dev/query/total_backfill_tickets",
-		Description: "Total number of backfill tickets",
-		Aggregation: view.LastValue(),
-	}
-	pendingTotalTicketsView = &view.View{
-		Measure:     totalPendingTickets,
-		Name:        "open-match.dev/query/total_pending_tickets",
-		Description: "Total number of pending tickets",
-		Aggregation: view.LastValue(),
-	}
 	cacheTotalItemsView = &view.View{
 		Measure:     cacheTotalItems,
 		Name:        "open-match.dev/query/total_cached_items",
@ -111,10 +90,7 @@ func BindService(p *appmain.Params, b *appmain.Bindings) error {
 	}, pb.RegisterQueryServiceHandlerFromEndpoint)
 	b.RegisterViews(
 		ticketsPerQueryView,
-		ticketsActiveTotalView,
 		backfillsPerQueryView,
-		backfillTotalTicketsView,
-		pendingTotalTicketsView,
 		cacheTotalItemsView,
 		cacheUpdateView,
 		cacheFetchedItemsView,
--- a/internal/config/config.go
+++ b/internal/config/config.go
@ -58,30 +58,6 @@ func Read() (*viper.Viper, error) {
 		return nil, fmt.Errorf("fatal error reading override config file, desc: %s", err.Error())
 	}

-	if !cfg.IsSet("registrationInterval") {
-		log.Printf("config: registrationInterval is not set in matchmaker_config_override.yaml")
-	}
-
-	if !cfg.IsSet("proposalCollectionInterval") {
-		log.Printf("config: proposalCollectionInterval is not set in matchmaker_config_override.yaml")
-	}
-
-	if !cfg.IsSet("pendingReleaseTimeout") {
-		log.Printf("config: pendingReleaseTimeout is not set in matchmaker_config_override.yaml")
-	}
-
-	if !cfg.IsSet("assignedDeleteTimeout") {
-		log.Printf("config: assignedDeleteTimeout is not set in matchmaker_config_override.yaml")
-	}
-
-	if !cfg.IsSet("queryPageSize") {
-		log.Printf("config: queryPageSize is not set in matchmaker_config_override.yaml")
-	}
-
-	if !cfg.IsSet("backfillLockTimeout") {
-		log.Printf("config: backfillLockTimeout is not set in matchmaker_config_override.yaml")
-	}
-
 	// Look for updates to the config; in Kubernetes, this is implemented using
 	// a ConfigMap that is written to the matchmaker_config_override.yaml file, which is
 	// what the Open Match components using Viper monitor for changes.
--- a/internal/rpc/clients_test.go
+++ b/internal/rpc/clients_test.go
@ -30,9 +30,9 @@ import (
 	"google.golang.org/grpc"
 	"open-match.dev/open-match/internal/config"
 	"open-match.dev/open-match/internal/telemetry"
+	shellTesting "open-match.dev/open-match/internal/testing"
 	utilTesting "open-match.dev/open-match/internal/util/testing"
 	"open-match.dev/open-match/pkg/pb"
-	shellTesting "open-match.dev/open-match/testing"
 	certgenTesting "open-match.dev/open-match/tools/certgen/testing"
 )

--- a/internal/rpc/insecure_test.go
+++ b/internal/rpc/insecure_test.go
@ -24,7 +24,7 @@ import (

 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
-	shellTesting "open-match.dev/open-match/testing"
+	shellTesting "open-match.dev/open-match/internal/testing"
 )

 func TestInsecureStartStop(t *testing.T) {
--- a/internal/rpc/server_test.go
+++ b/internal/rpc/server_test.go
@ -25,9 +25,9 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
 	"open-match.dev/open-match/internal/telemetry"
+	shellTesting "open-match.dev/open-match/internal/testing"
 	utilTesting "open-match.dev/open-match/internal/util/testing"
 	"open-match.dev/open-match/pkg/pb"
-	shellTesting "open-match.dev/open-match/testing"
 )

 func TestStartStopServer(t *testing.T) {
--- a/internal/rpc/tls_server_test.go
+++ b/internal/rpc/tls_server_test.go
@ -25,8 +25,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
+	shellTesting "open-match.dev/open-match/internal/testing"
 	"open-match.dev/open-match/pkg/pb"
-	shellTesting "open-match.dev/open-match/testing"
 	certgenTesting "open-match.dev/open-match/tools/certgen/testing"
 )

--- a/internal/statestore/backfill.go
+++ b/internal/statestore/backfill.go
@ -193,7 +193,7 @@ func (rb *redisBackend) UpdateBackfill(ctx context.Context, backfill *pb.Backfil
 	}
 	defer handleConnectionClose(&redisConn)

-	expired, err := isBackfillExpired(redisConn, backfill.Id, getBackfillReleaseTimeoutFraction(rb.cfg))
+	expired, err := isBackfillExpired(redisConn, backfill.Id, getBackfillReleaseTimeout(rb.cfg))
 	if err != nil {
 		return err
 	}
@ -332,7 +332,7 @@ func (rb *redisBackend) UpdateAcknowledgmentTimestamp(ctx context.Context, id st
 	}
 	defer handleConnectionClose(&redisConn)

-	expired, err := isBackfillExpired(redisConn, id, getBackfillReleaseTimeoutFraction(rb.cfg))
+	expired, err := isBackfillExpired(redisConn, id, getBackfillReleaseTimeout(rb.cfg))
 	if err != nil {
 		return err
 	}
@ -364,7 +364,7 @@ func (rb *redisBackend) GetExpiredBackfillIDs(ctx context.Context) ([]string, er
 	}
 	defer handleConnectionClose(&redisConn)

-	ttl := getBackfillReleaseTimeoutFraction(rb.cfg)
+	ttl := getBackfillReleaseTimeout(rb.cfg)
 	curTime := time.Now()
 	endTimeInt := curTime.Add(-ttl).UnixNano()
 	startTimeInt := 0
@ -431,7 +431,7 @@ func (rb *redisBackend) GetIndexedBackfills(ctx context.Context) (map[string]int
 	}
 	defer handleConnectionClose(&redisConn)

-	ttl := getBackfillReleaseTimeoutFraction(rb.cfg)
+	ttl := getBackfillReleaseTimeout(rb.cfg)
 	curTime := time.Now()
 	endTimeInt := curTime.Add(time.Hour).UnixNano()
 	startTimeInt := curTime.Add(-ttl).UnixNano()
@ -463,22 +463,7 @@ func (rb *redisBackend) GetIndexedBackfills(ctx context.Context) (map[string]int
 }

 func getBackfillReleaseTimeout(cfg config.View) time.Duration {
-	const (
-		name = "pendingReleaseTimeout"
-		// Default timeout to release backfill. This value
-		// will be used if pendingReleaseTimeout is not configured.
-		defaultpendingReleaseTimeout time.Duration = 1 * time.Minute
-	)
-
-	if !cfg.IsSet(name) {
-		return defaultpendingReleaseTimeout
-	}
-
-	return cfg.GetDuration(name)
-}
-
-func getBackfillReleaseTimeoutFraction(cfg config.View) time.Duration {
 	// Use a fraction 80% of pendingRelease Tickets TTL
-	ttl := getBackfillReleaseTimeout(cfg) / 5 * 4
+	ttl := cfg.GetDuration("pendingReleaseTimeout") / 5 * 4
 	return ttl
 }
--- a/internal/statestore/redis.go
+++ b/internal/statestore/redis.go
@ -41,11 +41,11 @@ var (

 // NewMutex returns a new distributed mutex with given name
 func (rb *redisBackend) NewMutex(key string) RedisLocker {
-	m := redsync.NewMutex(fmt.Sprintf("lock/%s", key), rs.WithExpiry(getBackfillLockTimeout(rb.cfg)))
+	m := redsync.NewMutex(fmt.Sprintf("lock/%s", key), rs.WithExpiry(rb.cfg.GetDuration("backfillLockTimeout")))
 	return redisBackend{mutex: m}
 }

-// Lock locks r. In case it returns an error on failure, you may retry to acquire the lock by calling this method again.
+//Lock locks r. In case it returns an error on failure, you may retry to acquire the lock by calling this method again.
 func (rb redisBackend) Lock(ctx context.Context) error {
 	return rb.mutex.LockContext(ctx)
 }
@ -246,18 +246,3 @@ func handleConnectionClose(conn *redis.Conn) {
 		}).Debug("failed to close redis client connection.")
 	}
 }
-
-func getBackfillLockTimeout(cfg config.View) time.Duration {
-	const (
-		name = "backfillLockTimeout"
-		// Default timeout to lock backfill. This value
-		// will be used if backfillLockTimeout is not configured.
-		defaultBackfillLockTimeout time.Duration = 1 * time.Minute
-	)
-
-	if !cfg.IsSet(name) {
-		return defaultBackfillLockTimeout
-	}
-
-	return cfg.GetDuration(name)
-}
--- a/internal/statestore/ticket.go
+++ b/internal/statestore/ticket.go
@ -25,7 +25,6 @@ import (
 	"github.com/pkg/errors"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"open-match.dev/open-match/internal/config"
 	"open-match.dev/open-match/pkg/pb"
 )

@ -155,7 +154,7 @@ func (rb *redisBackend) GetIndexedIDSet(ctx context.Context) (map[string]struct{
 	}
 	defer handleConnectionClose(&redisConn)

-	ttl := getBackfillReleaseTimeout(rb.cfg)
+	ttl := rb.cfg.GetDuration("pendingReleaseTimeout")
 	curTime := time.Now()
 	endTimeInt := curTime.Add(time.Hour).UnixNano()
 	startTimeInt := curTime.Add(-ttl).UnixNano()
@ -256,10 +255,6 @@ func (rb *redisBackend) UpdateAssignments(ctx context.Context, req *pb.AssignTic
 		}
 	}

-	if len(idsI) == 0 {
-		return nil, nil, status.Error(codes.InvalidArgument, "AssignmentGroupTicketIds is empty")
-	}
-
 	ticketBytes, err := redis.ByteSlices(redisConn.Do("MGET", idsI...))
 	if err != nil {
 		return nil, nil, err
@ -283,7 +278,7 @@ func (rb *redisBackend) UpdateAssignments(ctx context.Context, req *pb.AssignTic
 			tickets = append(tickets, t)
 		}
 	}
-	assignmentTimeout := getAssignedDeleteTimeout(rb.cfg) / time.Millisecond
+	assignmentTimeout := rb.cfg.GetDuration("assignedDeleteTimeout") / time.Millisecond
 	err = redisConn.Send("MULTI")
 	if err != nil {
 		return nil, nil, errors.Wrap(err, "error starting redis multi")
@ -447,18 +442,3 @@ func (rb *redisBackend) newExponentialBackoffStrategy() backoff.BackOff {
 	backoffStrat.MaxElapsedTime = rb.cfg.GetDuration("backoff.maxElapsedTime")
 	return backoff.BackOff(backoffStrat)
 }
-
-func getAssignedDeleteTimeout(cfg config.View) time.Duration {
-	const (
-		name = "assignedDeleteTimeout"
-		// Default timeout to delete tickets after assignment. This value
-		// will be used if assignedDeleteTimeout is not configured.
-		defaultAssignedDeleteTimeout time.Duration = 10 * time.Minute
-	)
-
-	if !cfg.IsSet(name) {
-		return defaultAssignedDeleteTimeout
-	}
-
-	return cfg.GetDuration(name)
-}
--- a/internal/statestore/ticket_test.go
+++ b/internal/statestore/ticket_test.go
@ -228,23 +228,6 @@ func TestUpdateAssignments(t *testing.T) {
 				assignedTicketsIDs: []string{"1"},
 			},
 		},
-		{
-			description: "empty ticketIds, error expected",
-			request: &pb.AssignTicketsRequest{
-				Assignments: []*pb.AssignmentGroup{
-					{
-						TicketIds:  []string{},
-						Assignment: &pb.Assignment{Connection: "2"},
-					},
-				},
-			},
-			expected: expected{
-				resp:               nil,
-				errCode:            codes.InvalidArgument,
-				errMessage:         "AssignmentGroupTicketIds is empty",
-				assignedTicketsIDs: nil,
-			},
-		},
 		{
 			description: "nil assignment, error expected",
 			request: &pb.AssignTicketsRequest{
--- a/internal/testing/e2e/README.md
+++ b/internal/testing/e2e/README.md
@ -18,7 +18,7 @@ of running the tests in a realistic setting where requests may not be routed to
 For a new test package under test/e2e/ do the following:

 Copy the contents of internal/testing/e2e/main_test.go and change the package name and add
-the `open-match.dev/open-match/testing/e2e` import.
+the `open-match.dev/open-match/internal/testing/e2e` import.

 Example (may be out of date):
 ```golang
@ -39,7 +39,7 @@ Example (may be out of date):
 package tickets

 import (
-	"open-match.dev/open-match/testing/e2e"
+	"open-match.dev/open-match/internal/testing/e2e"
 	"testing"
 )

--- a/internal/testing/e2e/backfill_test.go
+++ b/internal/testing/e2e/backfill_test.go
--- a/internal/testing/e2e/cluster.go
+++ b/internal/testing/e2e/cluster.go
@ -1,4 +1,3 @@
-//go:build e2ecluster
 // +build e2ecluster

 // Copyright 2019 Google LLC
@ -26,7 +25,7 @@ import (
 	"open-match.dev/open-match/internal/app/evaluator"
 	"open-match.dev/open-match/internal/config"
 	"open-match.dev/open-match/internal/statestore"
-	mmfService "open-match.dev/open-match/testing/mmf"
+	mmfService "open-match.dev/open-match/internal/testing/mmf"
 )

 func start(t *testing.T, eval evaluator.Evaluator, mmf mmfService.MatchFunction) (config.View, func(time.Duration)) {
--- a/internal/testing/e2e/cluster_test.go
+++ b/internal/testing/e2e/cluster_test.go
@ -1,4 +1,3 @@
-//go:build e2ecluster
 // +build e2ecluster

 // Copyright 2019 Google LLC
@ -33,8 +32,8 @@ import (
 	"open-match.dev/open-match/internal/app/evaluator"
 	"open-match.dev/open-match/internal/appmain/apptest"
 	"open-match.dev/open-match/internal/config"
+	mmfService "open-match.dev/open-match/internal/testing/mmf"
 	"open-match.dev/open-match/pkg/pb"
-	mmfService "open-match.dev/open-match/testing/mmf"
 )

 func TestServiceHealth(t *testing.T) {
--- a/internal/testing/e2e/common.go
+++ b/internal/testing/e2e/common.go
@ -25,8 +25,8 @@ import (
 	"open-match.dev/open-match/internal/app/evaluator"
 	"open-match.dev/open-match/internal/appmain/apptest"
 	"open-match.dev/open-match/internal/config"
+	mmfService "open-match.dev/open-match/internal/testing/mmf"
 	"open-match.dev/open-match/pkg/pb"
-	mmfService "open-match.dev/open-match/testing/mmf"
 )

 var (
--- a/internal/testing/e2e/fetch_matches_test.go
+++ b/internal/testing/e2e/fetch_matches_test.go
--- a/internal/testing/e2e/in_memory.go
+++ b/internal/testing/e2e/in_memory.go
@ -1,4 +1,3 @@
-//go:build !e2ecluster
 // +build !e2ecluster

 // Copyright 2019 Google LLC
@ -32,7 +31,7 @@ import (
 	"open-match.dev/open-match/internal/config"
 	"open-match.dev/open-match/internal/rpc"
 	"open-match.dev/open-match/internal/telemetry"
-	mmfService "open-match.dev/open-match/testing/mmf"
+	mmfService "open-match.dev/open-match/internal/testing/mmf"
 )

 func start(t *testing.T, eval evaluator.Evaluator, mmf mmfService.MatchFunction) (config.View, func(time.Duration)) {
--- a/internal/testing/e2e/query_backfills_test.go
+++ b/internal/testing/e2e/query_backfills_test.go
--- a/internal/testing/e2e/query_tickets_test.go
+++ b/internal/testing/e2e/query_tickets_test.go
--- a/internal/testing/e2e/ticket_test.go
+++ b/internal/testing/e2e/ticket_test.go
@ -74,27 +74,6 @@ func TestAssignTickets(t *testing.T) {
 	require.Equal(t, "b", get.Assignment.Connection)
 }

-// TestAssignTicketsEmpty covers calls to assign when empty TicketIds
-func TestAssignTicketsEmpty(t *testing.T) {
-	om := newOM(t)
-	ctx := context.Background()
-
-	req := &pb.AssignTicketsRequest{
-		Assignments: []*pb.AssignmentGroup{
-			{
-				TicketIds:  []string{},
-				Assignment: &pb.Assignment{Connection: "a"},
-			},
-		},
-	}
-
-	resp, err := om.Backend().AssignTickets(ctx, req)
-	require.Nil(t, resp)
-	require.Equal(t, codes.InvalidArgument.String(), status.Convert(err).Code().String())
-	require.Equal(t, "AssignmentGroupTicketIds is empty", status.Convert(err).Message())
-
-}
-
 // TestAssignTicketsInvalidArgument covers various invalid calls to assign
 // tickets.
 func TestAssignTicketsInvalidArgument(t *testing.T) {
--- a/internal/testing/fake_frontend.go
+++ b/internal/testing/fake_frontend.go
--- a/internal/testing/mmf/matchfunction.go
+++ b/internal/testing/mmf/matchfunction.go
--- a/internal/testing/mmf/matchfunction_service.go
+++ b/internal/testing/mmf/matchfunction_service.go
--- a/pkg/pb/messages.pb.go
+++ b/pkg/pb/messages.pb.go
@ -117,13 +117,9 @@ type Ticket struct {
 	// making function, evaluator, and components making calls to Open Match.
 	// Optional, depending on the requirements of the connected systems.
 	Extensions map[string]*any.Any `protobuf:"bytes,5,rep,name=extensions,proto3" json:"extensions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// Customized information not inspected by Open Match, to be kept persistent
-	// throughout the life-cycle of a ticket.
-	// Optional, depending on the requirements of the connected systems.
-	PersistentField map[string]*any.Any `protobuf:"bytes,6,rep,name=persistent_field,json=persistentField,proto3" json:"persistent_field,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Create time is the time the Ticket was created. It is populated by Open
 	// Match at the time of Ticket creation.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 }

 func (x *Ticket) Reset() {
@ -186,13 +182,6 @@ func (x *Ticket) GetExtensions() map[string]*any.Any {
 	return nil
 }

-func (x *Ticket) GetPersistentField() map[string]*any.Any {
-	if x != nil {
-		return x.PersistentField
-	}
-	return nil
-}
-
 func (x *Ticket) GetCreateTime() *timestamp.Timestamp {
 	if x != nil {
 		return x.CreateTime
@ -330,23 +319,18 @@ func (x *Assignment) GetExtensions() map[string]*any.Any {
 }

 // Filters numerical values to only those within a range.
-//
-//	double_arg: "foo"
-//	max: 10
-//	min: 5
-//
+//   double_arg: "foo"
+//   max: 10
+//   min: 5
 // matches:
-//
-//	{"foo": 5}
-//	{"foo": 7.5}
-//	{"foo": 10}
-//
+//   {"foo": 5}
+//   {"foo": 7.5}
+//   {"foo": 10}
 // does not match:
-//
-//	{"foo": 4}
-//	{"foo": 10.01}
-//	{"foo": "7.5"}
-//	{}
+//   {"foo": 4}
+//   {"foo": 10.01}
+//   {"foo": "7.5"}
+//   {}
 type DoubleRangeFilter struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@ -425,19 +409,14 @@ func (x *DoubleRangeFilter) GetExclude() DoubleRangeFilter_Exclude {
 }

 // Filters strings exactly equaling a value.
-//
-//	string_arg: "foo"
-//	value: "bar"
-//
+//   string_arg: "foo"
+//   value: "bar"
 // matches:
-//
-//	{"foo": "bar"}
-//
+//   {"foo": "bar"}
 // does not match:
-//
-//	{"foo": "baz"}
-//	{"bar": "foo"}
-//	{}
+//   {"foo": "baz"}
+//   {"bar": "foo"}
+//   {}
 type StringEqualsFilter struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@ -495,18 +474,13 @@ func (x *StringEqualsFilter) GetValue() string {
 }

 // Filters to the tag being present on the search_fields.
-//
-//	tag: "foo"
-//
+//   tag: "foo"
 // matches:
-//
-//	["foo"]
-//	["bar","foo"]
-//
+//   ["foo"]
+//   ["bar","foo"]
 // does not match:
-//
-//	["bar"]
-//	[]
+//   ["bar"]
+//   []
 type TagPresentFilter struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@ -854,17 +828,13 @@ type Backfill struct {
 	// the Match Function, evaluator, and components making calls to Open Match.
 	// Optional, depending on the requirements of the connected systems.
 	Extensions map[string]*any.Any `protobuf:"bytes,3,rep,name=extensions,proto3" json:"extensions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// Customized information not inspected by Open Match, to be kept persistent
-	// throughout the life-cycle of a backfill.
-	// Optional, depending on the requirements of the connected systems.
-	PersistentField map[string]*any.Any `protobuf:"bytes,4,rep,name=persistent_field,json=persistentField,proto3" json:"persistent_field,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Create time is the time the Ticket was created. It is populated by Open
 	// Match at the time of Ticket creation.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Generation gets incremented on GameServers update operations.
 	// Prevents the MMF from overriding a newer version from the game server.
 	// Do NOT read or write to this field, it is for internal tracking, and changing the value will cause bugs.
-	Generation int64 `protobuf:"varint,6,opt,name=generation,proto3" json:"generation,omitempty"`
+	Generation int64 `protobuf:"varint,5,opt,name=generation,proto3" json:"generation,omitempty"`
 }

 func (x *Backfill) Reset() {
@ -920,13 +890,6 @@ func (x *Backfill) GetExtensions() map[string]*any.Any {
 	return nil
 }

-func (x *Backfill) GetPersistentField() map[string]*any.Any {
-	if x != nil {
-		return x.PersistentField
-	}
-	return nil
-}
-
 func (x *Backfill) GetCreateTime() *timestamp.Timestamp {
 	if x != nil {
 		return x.CreateTime
@ -951,7 +914,7 @@ var file_api_messages_proto_rawDesc = []byte{
 	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x22, 0x95, 0x04, 0x0a, 0x06, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12,
+	0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe8, 0x02, 0x0a, 0x06, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12,
 	0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12,
 	0x35, 0x0a, 0x0a, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x03, 0x20,
 	0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e,
@ -964,182 +927,161 @@ var file_api_messages_proto_rawDesc = []byte{
 	0x6e, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d,
 	0x61, 0x74, 0x63, 0x68, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x45, 0x78, 0x74, 0x65,
 	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x65, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x51, 0x0a, 0x10, 0x70, 0x65, 0x72, 0x73, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x74, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x26, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x54, 0x69,
-	0x63, 0x6b, 0x65, 0x74, 0x2e, 0x50, 0x65, 0x72, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x46,
-	0x69, 0x65, 0x6c, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x70, 0x65, 0x72, 0x73, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x74, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x3b, 0x0a, 0x0b, 0x63, 0x72,
-	0x65, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0a, 0x63, 0x72, 0x65,
-	0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x53, 0x0a, 0x0f, 0x45, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
-	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e,
-	0x79, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x58, 0x0a, 0x14,
-	0x50, 0x65, 0x72, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x22, 0xb4, 0x02, 0x0a,
-	0x0c, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12, 0x48, 0x0a,
-	0x0b, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x72, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x53,
-	0x65, 0x61, 0x72, 0x63, 0x68, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x2e, 0x44, 0x6f, 0x75, 0x62,
-	0x6c, 0x65, 0x41, 0x72, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x64, 0x6f, 0x75,
-	0x62, 0x6c, 0x65, 0x41, 0x72, 0x67, 0x73, 0x12, 0x48, 0x0a, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e,
-	0x67, 0x5f, 0x61, 0x72, 0x67, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6f,
-	0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x46,
-	0x69, 0x65, 0x6c, 0x64, 0x73, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x41, 0x72, 0x67, 0x73,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x41, 0x72, 0x67,
-	0x73, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x61, 0x67, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x04, 0x74, 0x61, 0x67, 0x73, 0x1a, 0x3d, 0x0a, 0x0f, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x41,
-	0x72, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3d, 0x0a, 0x0f, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x41, 0x72,
-	0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
-	0x02, 0x38, 0x01, 0x22, 0xd4, 0x01, 0x0a, 0x0a, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65,
-	0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x45, 0x0a, 0x0a, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
-	0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74,
-	0x63, 0x68, 0x2e, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x45, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x65,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x1a, 0x53, 0x0a, 0x0f, 0x45, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a,
-	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x4a, 0x04,
-	0x08, 0x02, 0x10, 0x03, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x22, 0xc7, 0x01, 0x0a, 0x11, 0x44,
-	0x6f, 0x75, 0x62, 0x6c, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x12, 0x1d, 0x0a, 0x0a, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x72, 0x67, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x41, 0x72, 0x67, 0x12,
-	0x10, 0x0a, 0x03, 0x6d, 0x61, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x03, 0x6d, 0x61,
-	0x78, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x01, 0x52, 0x03,
-	0x6d, 0x69, 0x6e, 0x12, 0x3e, 0x0a, 0x07, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x0e, 0x32, 0x24, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x2e, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x2e, 0x45, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x52, 0x07, 0x65, 0x78, 0x63, 0x6c,
-	0x75, 0x64, 0x65, 0x22, 0x2f, 0x0a, 0x07, 0x45, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x12, 0x08,
-	0x0a, 0x04, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x4d, 0x49, 0x4e, 0x10,
-	0x01, 0x12, 0x07, 0x0a, 0x03, 0x4d, 0x41, 0x58, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x42, 0x4f,
-	0x54, 0x48, 0x10, 0x03, 0x22, 0x49, 0x0a, 0x12, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x45, 0x71,
-	0x75, 0x61, 0x6c, 0x73, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x74,
-	0x72, 0x69, 0x6e, 0x67, 0x5f, 0x61, 0x72, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-	0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x41, 0x72, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22,
-	0x24, 0x0a, 0x10, 0x54, 0x61, 0x67, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x46, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x03, 0x74, 0x61, 0x67, 0x22, 0x94, 0x03, 0x0a, 0x04, 0x50, 0x6f, 0x6f, 0x6c, 0x12, 0x12,
-	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x12, 0x4e, 0x0a, 0x14, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x5f, 0x72, 0x61, 0x6e,
-	0x67, 0x65, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x44, 0x6f, 0x75,
-	0x62, 0x6c, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x12,
-	0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65,
-	0x72, 0x73, 0x12, 0x51, 0x0a, 0x15, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x65, 0x71, 0x75,
-	0x61, 0x6c, 0x73, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x1d, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x53, 0x74,
-	0x72, 0x69, 0x6e, 0x67, 0x45, 0x71, 0x75, 0x61, 0x6c, 0x73, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x52, 0x13, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x45, 0x71, 0x75, 0x61, 0x6c, 0x73, 0x46, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x73, 0x12, 0x4b, 0x0a, 0x13, 0x74, 0x61, 0x67, 0x5f, 0x70, 0x72, 0x65,
-	0x73, 0x65, 0x6e, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x54,
-	0x61, 0x67, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52,
-	0x11, 0x74, 0x61, 0x67, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x46, 0x69, 0x6c, 0x74, 0x65,
-	0x72, 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x65,
-	0x66, 0x6f, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d,
-	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0d, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42,
-	0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x3f, 0x0a, 0x0d, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x5f, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67,
+	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3b, 0x0a, 0x0b, 0x63, 0x72, 0x65, 0x61, 0x74,
+	0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67,
 	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54,
-	0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0c, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65,
-	0x64, 0x41, 0x66, 0x74, 0x65, 0x72, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x22, 0xf3, 0x01, 0x0a,
-	0x0c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x12, 0x12, 0x0a,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x12, 0x25, 0x0a, 0x05, 0x70, 0x6f, 0x6f, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x0f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x50, 0x6f, 0x6f,
-	0x6c, 0x52, 0x05, 0x70, 0x6f, 0x6f, 0x6c, 0x73, 0x12, 0x47, 0x0a, 0x0a, 0x65, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6f,
-	0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72,
-	0x6f, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x1a, 0x53, 0x0a, 0x0f, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x4a, 0x04, 0x08, 0x04,
-	0x10, 0x05, 0x22, 0xa0, 0x03, 0x0a, 0x05, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x19, 0x0a, 0x08,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x49, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x5f, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x12, 0x25, 0x0a, 0x0e,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x46, 0x75, 0x6e, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x07, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x18, 0x04,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x07, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x73,
-	0x12, 0x40, 0x0a, 0x0a, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x07,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x12, 0x2f, 0x0a, 0x08, 0x62, 0x61, 0x63, 0x6b, 0x66, 0x69, 0x6c, 0x6c, 0x18, 0x08,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x2e, 0x42, 0x61, 0x63, 0x6b, 0x66, 0x69, 0x6c, 0x6c, 0x52, 0x08, 0x62, 0x61, 0x63, 0x6b, 0x66,
-	0x69, 0x6c, 0x6c, 0x12, 0x2f, 0x0a, 0x13, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x65, 0x5f,
-	0x67, 0x61, 0x6d, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x12, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x65, 0x47, 0x61, 0x6d, 0x65, 0x73, 0x65,
-	0x72, 0x76, 0x65, 0x72, 0x1a, 0x53, 0x0a, 0x0f, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
+	0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x54, 0x69, 0x6d, 0x65, 0x1a, 0x53, 0x0a, 0x0f, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
 	0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c,
 	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
 	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x4a,
-	0x04, 0x08, 0x06, 0x10, 0x07, 0x22, 0xfe, 0x03, 0x0a, 0x08, 0x42, 0x61, 0x63, 0x6b, 0x66, 0x69,
-	0x6c, 0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
-	0x69, 0x64, 0x12, 0x3c, 0x0a, 0x0d, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x5f, 0x66, 0x69, 0x65,
-	0x6c, 0x64, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6f, 0x70, 0x65, 0x6e,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x46, 0x69, 0x65, 0x6c,
-	0x64, 0x73, 0x52, 0x0c, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73,
-	0x12, 0x43, 0x0a, 0x0a, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x2e, 0x42, 0x61, 0x63, 0x6b, 0x66, 0x69, 0x6c, 0x6c, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x65, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x53, 0x0a, 0x10, 0x70, 0x65, 0x72, 0x73, 0x69, 0x73, 0x74,
-	0x65, 0x6e, 0x74, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x28, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x42, 0x61, 0x63, 0x6b,
-	0x66, 0x69, 0x6c, 0x6c, 0x2e, 0x50, 0x65, 0x72, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x46,
-	0x69, 0x65, 0x6c, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x70, 0x65, 0x72, 0x73, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x74, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x3b, 0x0a, 0x0b, 0x63, 0x72,
-	0x65, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x22,
+	0xb4, 0x02, 0x0a, 0x0c, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73,
+	0x12, 0x48, 0x0a, 0x0b, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x72, 0x67, 0x73, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63,
+	0x68, 0x2e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x2e, 0x44,
+	0x6f, 0x75, 0x62, 0x6c, 0x65, 0x41, 0x72, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a,
+	0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x41, 0x72, 0x67, 0x73, 0x12, 0x48, 0x0a, 0x0b, 0x73, 0x74,
+	0x72, 0x69, 0x6e, 0x67, 0x5f, 0x61, 0x72, 0x67, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x27, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x53, 0x65, 0x61, 0x72,
+	0x63, 0x68, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x41,
+	0x72, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67,
+	0x41, 0x72, 0x67, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x61, 0x67, 0x73, 0x18, 0x03, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x1a, 0x3d, 0x0a, 0x0f, 0x44, 0x6f, 0x75, 0x62,
+	0x6c, 0x65, 0x41, 0x72, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3d, 0x0a, 0x0f, 0x53, 0x74, 0x72, 0x69, 0x6e,
+	0x67, 0x41, 0x72, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xd4, 0x01, 0x0a, 0x0a, 0x41, 0x73, 0x73, 0x69, 0x67,
+	0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x45, 0x0a, 0x0a, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x6f, 0x70, 0x65, 0x6e,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74,
+	0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x52, 0x0a, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x1a, 0x53, 0x0a, 0x0f,
+	0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
+	0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
+	0x01, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x22, 0xc7, 0x01,
+	0x0a, 0x11, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6c,
+	0x74, 0x65, 0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x72,
+	0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x41,
+	0x72, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x61, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52,
+	0x03, 0x6d, 0x61, 0x78, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x01, 0x52, 0x03, 0x6d, 0x69, 0x6e, 0x12, 0x3e, 0x0a, 0x07, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64,
+	0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x24, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x2e, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x46,
+	0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x45, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x52, 0x07, 0x65,
+	0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x22, 0x2f, 0x0a, 0x07, 0x45, 0x78, 0x63, 0x6c, 0x75, 0x64,
+	0x65, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x4d,
+	0x49, 0x4e, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x4d, 0x41, 0x58, 0x10, 0x02, 0x12, 0x08, 0x0a,
+	0x04, 0x42, 0x4f, 0x54, 0x48, 0x10, 0x03, 0x22, 0x49, 0x0a, 0x12, 0x53, 0x74, 0x72, 0x69, 0x6e,
+	0x67, 0x45, 0x71, 0x75, 0x61, 0x6c, 0x73, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x1d, 0x0a,
+	0x0a, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x61, 0x72, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x09, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x41, 0x72, 0x67, 0x12, 0x14, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x22, 0x24, 0x0a, 0x10, 0x54, 0x61, 0x67, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74,
+	0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x74, 0x61, 0x67, 0x22, 0x94, 0x03, 0x0a, 0x04, 0x50, 0x6f, 0x6f,
+	0x6c, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x4e, 0x0a, 0x14, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x5f,
+	0x72, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e,
+	0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65,
+	0x72, 0x52, 0x12, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x46, 0x69,
+	0x6c, 0x74, 0x65, 0x72, 0x73, 0x12, 0x51, 0x0a, 0x15, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f,
+	0x65, 0x71, 0x75, 0x61, 0x6c, 0x73, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x04,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68,
+	0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x45, 0x71, 0x75, 0x61, 0x6c, 0x73, 0x46, 0x69, 0x6c,
+	0x74, 0x65, 0x72, 0x52, 0x13, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x45, 0x71, 0x75, 0x61, 0x6c,
+	0x73, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x12, 0x4b, 0x0a, 0x13, 0x74, 0x61, 0x67, 0x5f,
+	0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18,
+	0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63,
+	0x68, 0x2e, 0x54, 0x61, 0x67, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x46, 0x69, 0x6c, 0x74,
+	0x65, 0x72, 0x52, 0x11, 0x74, 0x61, 0x67, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x46, 0x69,
+	0x6c, 0x74, 0x65, 0x72, 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64,
+	0x5f, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0d, 0x63, 0x72, 0x65, 0x61, 0x74,
+	0x65, 0x64, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x3f, 0x0a, 0x0d, 0x63, 0x72, 0x65, 0x61,
+	0x74, 0x65, 0x64, 0x5f, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0a, 0x63, 0x72, 0x65,
-	0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x67, 0x65, 0x6e, 0x65, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x67, 0x65, 0x6e,
-	0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x53, 0x0a, 0x0f, 0x45, 0x78, 0x74, 0x65, 0x6e,
+	0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0c, 0x63, 0x72, 0x65,
+	0x61, 0x74, 0x65, 0x64, 0x41, 0x66, 0x74, 0x65, 0x72, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x22,
+	0xf3, 0x01, 0x0a, 0x0c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65,
+	0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x70, 0x6f, 0x6f, 0x6c, 0x73, 0x18, 0x03, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e,
+	0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x05, 0x70, 0x6f, 0x6f, 0x6c, 0x73, 0x12, 0x47, 0x0a, 0x0a, 0x65,
+	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x27, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
+	0x69, 0x6f, 0x6e, 0x73, 0x1a, 0x53, 0x0a, 0x0f, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
+	0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x4a,
+	0x04, 0x08, 0x04, 0x10, 0x05, 0x22, 0xa0, 0x03, 0x0a, 0x05, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12,
+	0x19, 0x0a, 0x08, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x07, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x49, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x5f, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0c, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x12,
+	0x25, 0x0a, 0x0e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x46, 0x75,
+	0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x07, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74,
+	0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x07, 0x74, 0x69, 0x63, 0x6b,
+	0x65, 0x74, 0x73, 0x12, 0x40, 0x0a, 0x0a, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+	0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
+	0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x65, 0x78, 0x74, 0x65, 0x6e,
+	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2f, 0x0a, 0x08, 0x62, 0x61, 0x63, 0x6b, 0x66, 0x69, 0x6c,
+	0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x2e, 0x42, 0x61, 0x63, 0x6b, 0x66, 0x69, 0x6c, 0x6c, 0x52, 0x08, 0x62, 0x61,
+	0x63, 0x6b, 0x66, 0x69, 0x6c, 0x6c, 0x12, 0x2f, 0x0a, 0x13, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x61,
+	0x74, 0x65, 0x5f, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x09, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x12, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x65, 0x47, 0x61, 0x6d,
+	0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x1a, 0x53, 0x0a, 0x0f, 0x45, 0x78, 0x74, 0x65, 0x6e,
 	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
 	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05,
 	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f,
 	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e,
-	0x79, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x58, 0x0a, 0x14,
-	0x50, 0x65, 0x72, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x2e, 0x5a, 0x20, 0x6f, 0x70, 0x65, 0x6e, 0x2d, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x2e, 0x64, 0x65, 0x76, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x2d, 0x6d, 0x61,
-	0x74, 0x63, 0x68, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x62, 0xaa, 0x02, 0x09, 0x4f, 0x70, 0x65,
-	0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x79, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x4a, 0x04, 0x08, 0x05,
+	0x10, 0x06, 0x4a, 0x04, 0x08, 0x06, 0x10, 0x07, 0x22, 0xcf, 0x02, 0x0a, 0x08, 0x42, 0x61, 0x63,
+	0x6b, 0x66, 0x69, 0x6c, 0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x3c, 0x0a, 0x0d, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x5f,
+	0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6f,
+	0x70, 0x65, 0x6e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x46,
+	0x69, 0x65, 0x6c, 0x64, 0x73, 0x52, 0x0c, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x46, 0x69, 0x65,
+	0x6c, 0x64, 0x73, 0x12, 0x43, 0x0a, 0x0a, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+	0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x2e, 0x42, 0x61, 0x63, 0x6b, 0x66, 0x69, 0x6c, 0x6c, 0x2e, 0x45, 0x78, 0x74,
+	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x65, 0x78,
+	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3b, 0x0a, 0x0b, 0x63, 0x72, 0x65, 0x61,
+	0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74,
+	0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x67, 0x65, 0x6e, 0x65, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x53, 0x0a, 0x0f, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x2e, 0x5a, 0x20, 0x6f, 0x70,
+	0x65, 0x6e, 0x2d, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x64, 0x65, 0x76, 0x2f, 0x6f, 0x70, 0x65,
+	0x6e, 0x2d, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x62, 0xaa, 0x02,
+	0x09, 0x4f, 0x70, 0x65, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }

 var (
@ -1155,7 +1097,7 @@ func file_api_messages_proto_rawDescGZIP() []byte {
 }

 var file_api_messages_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_api_messages_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
+var file_api_messages_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
 var file_api_messages_proto_goTypes = []interface{}{
 	(DoubleRangeFilter_Exclude)(0), // 0: openmatch.DoubleRangeFilter.Exclude
 	(*Ticket)(nil),                 // 1: openmatch.Ticket
@ -1169,53 +1111,47 @@ var file_api_messages_proto_goTypes = []interface{}{
 	(*Match)(nil),                  // 9: openmatch.Match
 	(*Backfill)(nil),               // 10: openmatch.Backfill
 	nil,                            // 11: openmatch.Ticket.ExtensionsEntry
-	nil,                            // 12: openmatch.Ticket.PersistentFieldEntry
-	nil,                            // 13: openmatch.SearchFields.DoubleArgsEntry
-	nil,                            // 14: openmatch.SearchFields.StringArgsEntry
-	nil,                            // 15: openmatch.Assignment.ExtensionsEntry
-	nil,                            // 16: openmatch.MatchProfile.ExtensionsEntry
-	nil,                            // 17: openmatch.Match.ExtensionsEntry
-	nil,                            // 18: openmatch.Backfill.ExtensionsEntry
-	nil,                            // 19: openmatch.Backfill.PersistentFieldEntry
-	(*timestamp.Timestamp)(nil),    // 20: google.protobuf.Timestamp
-	(*any.Any)(nil),                // 21: google.protobuf.Any
+	nil,                            // 12: openmatch.SearchFields.DoubleArgsEntry
+	nil,                            // 13: openmatch.SearchFields.StringArgsEntry
+	nil,                            // 14: openmatch.Assignment.ExtensionsEntry
+	nil,                            // 15: openmatch.MatchProfile.ExtensionsEntry
+	nil,                            // 16: openmatch.Match.ExtensionsEntry
+	nil,                            // 17: openmatch.Backfill.ExtensionsEntry
+	(*timestamp.Timestamp)(nil),    // 18: google.protobuf.Timestamp
+	(*any.Any)(nil),                // 19: google.protobuf.Any
 }
 var file_api_messages_proto_depIdxs = []int32{
 	3,  // 0: openmatch.Ticket.assignment:type_name -> openmatch.Assignment
 	2,  // 1: openmatch.Ticket.search_fields:type_name -> openmatch.SearchFields
 	11, // 2: openmatch.Ticket.extensions:type_name -> openmatch.Ticket.ExtensionsEntry
-	12, // 3: openmatch.Ticket.persistent_field:type_name -> openmatch.Ticket.PersistentFieldEntry
-	20, // 4: openmatch.Ticket.create_time:type_name -> google.protobuf.Timestamp
-	13, // 5: openmatch.SearchFields.double_args:type_name -> openmatch.SearchFields.DoubleArgsEntry
-	14, // 6: openmatch.SearchFields.string_args:type_name -> openmatch.SearchFields.StringArgsEntry
-	15, // 7: openmatch.Assignment.extensions:type_name -> openmatch.Assignment.ExtensionsEntry
-	0,  // 8: openmatch.DoubleRangeFilter.exclude:type_name -> openmatch.DoubleRangeFilter.Exclude
-	4,  // 9: openmatch.Pool.double_range_filters:type_name -> openmatch.DoubleRangeFilter
-	5,  // 10: openmatch.Pool.string_equals_filters:type_name -> openmatch.StringEqualsFilter
-	6,  // 11: openmatch.Pool.tag_present_filters:type_name -> openmatch.TagPresentFilter
-	20, // 12: openmatch.Pool.created_before:type_name -> google.protobuf.Timestamp
-	20, // 13: openmatch.Pool.created_after:type_name -> google.protobuf.Timestamp
-	7,  // 14: openmatch.MatchProfile.pools:type_name -> openmatch.Pool
-	16, // 15: openmatch.MatchProfile.extensions:type_name -> openmatch.MatchProfile.ExtensionsEntry
-	1,  // 16: openmatch.Match.tickets:type_name -> openmatch.Ticket
-	17, // 17: openmatch.Match.extensions:type_name -> openmatch.Match.ExtensionsEntry
-	10, // 18: openmatch.Match.backfill:type_name -> openmatch.Backfill
-	2,  // 19: openmatch.Backfill.search_fields:type_name -> openmatch.SearchFields
-	18, // 20: openmatch.Backfill.extensions:type_name -> openmatch.Backfill.ExtensionsEntry
-	19, // 21: openmatch.Backfill.persistent_field:type_name -> openmatch.Backfill.PersistentFieldEntry
-	20, // 22: openmatch.Backfill.create_time:type_name -> google.protobuf.Timestamp
-	21, // 23: openmatch.Ticket.ExtensionsEntry.value:type_name -> google.protobuf.Any
-	21, // 24: openmatch.Ticket.PersistentFieldEntry.value:type_name -> google.protobuf.Any
-	21, // 25: openmatch.Assignment.ExtensionsEntry.value:type_name -> google.protobuf.Any
-	21, // 26: openmatch.MatchProfile.ExtensionsEntry.value:type_name -> google.protobuf.Any
-	21, // 27: openmatch.Match.ExtensionsEntry.value:type_name -> google.protobuf.Any
-	21, // 28: openmatch.Backfill.ExtensionsEntry.value:type_name -> google.protobuf.Any
-	21, // 29: openmatch.Backfill.PersistentFieldEntry.value:type_name -> google.protobuf.Any
-	30, // [30:30] is the sub-list for method output_type
-	30, // [30:30] is the sub-list for method input_type
-	30, // [30:30] is the sub-list for extension type_name
-	30, // [30:30] is the sub-list for extension extendee
-	0,  // [0:30] is the sub-list for field type_name
+	18, // 3: openmatch.Ticket.create_time:type_name -> google.protobuf.Timestamp
+	12, // 4: openmatch.SearchFields.double_args:type_name -> openmatch.SearchFields.DoubleArgsEntry
+	13, // 5: openmatch.SearchFields.string_args:type_name -> openmatch.SearchFields.StringArgsEntry
+	14, // 6: openmatch.Assignment.extensions:type_name -> openmatch.Assignment.ExtensionsEntry
+	0,  // 7: openmatch.DoubleRangeFilter.exclude:type_name -> openmatch.DoubleRangeFilter.Exclude
+	4,  // 8: openmatch.Pool.double_range_filters:type_name -> openmatch.DoubleRangeFilter
+	5,  // 9: openmatch.Pool.string_equals_filters:type_name -> openmatch.StringEqualsFilter
+	6,  // 10: openmatch.Pool.tag_present_filters:type_name -> openmatch.TagPresentFilter
+	18, // 11: openmatch.Pool.created_before:type_name -> google.protobuf.Timestamp
+	18, // 12: openmatch.Pool.created_after:type_name -> google.protobuf.Timestamp
+	7,  // 13: openmatch.MatchProfile.pools:type_name -> openmatch.Pool
+	15, // 14: openmatch.MatchProfile.extensions:type_name -> openmatch.MatchProfile.ExtensionsEntry
+	1,  // 15: openmatch.Match.tickets:type_name -> openmatch.Ticket
+	16, // 16: openmatch.Match.extensions:type_name -> openmatch.Match.ExtensionsEntry
+	10, // 17: openmatch.Match.backfill:type_name -> openmatch.Backfill
+	2,  // 18: openmatch.Backfill.search_fields:type_name -> openmatch.SearchFields
+	17, // 19: openmatch.Backfill.extensions:type_name -> openmatch.Backfill.ExtensionsEntry
+	18, // 20: openmatch.Backfill.create_time:type_name -> google.protobuf.Timestamp
+	19, // 21: openmatch.Ticket.ExtensionsEntry.value:type_name -> google.protobuf.Any
+	19, // 22: openmatch.Assignment.ExtensionsEntry.value:type_name -> google.protobuf.Any
+	19, // 23: openmatch.MatchProfile.ExtensionsEntry.value:type_name -> google.protobuf.Any
+	19, // 24: openmatch.Match.ExtensionsEntry.value:type_name -> google.protobuf.Any
+	19, // 25: openmatch.Backfill.ExtensionsEntry.value:type_name -> google.protobuf.Any
+	26, // [26:26] is the sub-list for method output_type
+	26, // [26:26] is the sub-list for method input_type
+	26, // [26:26] is the sub-list for extension type_name
+	26, // [26:26] is the sub-list for extension extendee
+	0,  // [0:26] is the sub-list for field type_name
 }

 func init() { file_api_messages_proto_init() }
@ -1351,7 +1287,7 @@ func file_api_messages_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_api_messages_proto_rawDesc,
 			NumEnums:      1,
-			NumMessages:   19,
+			NumMessages:   17,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
--- a/third_party/swaggerui/config.json
+++ b/third_party/swaggerui/config.json
@ -1,10 +1,10 @@
 {
    "urls": [
-        {"name": "Frontend", "url": "https://open-match.dev/api/v1.6.0/frontend.swagger.json"},
-        {"name": "Backend", "url": "https://open-match.dev/api/v1.6.0/backend.swagger.json"},
-        {"name": "Query", "url": "https://open-match.dev/api/v1.6.0/query.swagger.json"},
-        {"name": "MatchFunction", "url": "https://open-match.dev/api/v1.6.0/matchfunction.swagger.json"},
-        {"name": "Synchronizer", "url": "https://open-match.dev/api/v1.6.0/synchronizer.swagger.json"},
-        {"name": "Evaluator", "url": "https://open-match.dev/api/v1.6.0/evaluator.swagger.json"}
+        {"name": "Frontend", "url": "https://open-match.dev/api/v0.0.0-dev/frontend.swagger.json"},
+        {"name": "Backend", "url": "https://open-match.dev/api/v0.0.0-dev/backend.swagger.json"},
+        {"name": "Query", "url": "https://open-match.dev/api/v0.0.0-dev/query.swagger.json"},
+        {"name": "MatchFunction", "url": "https://open-match.dev/api/v0.0.0-dev/matchfunction.swagger.json"},
+        {"name": "Synchronizer", "url": "https://open-match.dev/api/v0.0.0-dev/synchronizer.swagger.json"},
+        {"name": "Evaluator", "url": "https://open-match.dev/api/v0.0.0-dev/evaluator.swagger.json"}
    ]
 }
--- a/tutorials/custom_evaluator/director/Dockerfile
+++ b/tutorials/custom_evaluator/director/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o director .

 CMD ["/app/director"]
--- a/tutorials/custom_evaluator/evaluator/Dockerfile
+++ b/tutorials/custom_evaluator/evaluator/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o evaluator .

 CMD ["/app/evaluator"]
--- a/tutorials/custom_evaluator/frontend/Dockerfile
+++ b/tutorials/custom_evaluator/frontend/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o frontend .

 CMD ["/app/frontend"]
--- a/tutorials/custom_evaluator/matchfunction/Dockerfile
+++ b/tutorials/custom_evaluator/matchfunction/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o matchfunction .

 CMD ["/app/matchfunction"]
--- a/tutorials/custom_evaluator/solution/director/Dockerfile
+++ b/tutorials/custom_evaluator/solution/director/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o director .

 CMD ["/app/director"]
--- a/tutorials/custom_evaluator/solution/evaluator/Dockerfile
+++ b/tutorials/custom_evaluator/solution/evaluator/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o evaluator .

 CMD ["/app/evaluator"]
--- a/tutorials/custom_evaluator/solution/frontend/Dockerfile
+++ b/tutorials/custom_evaluator/solution/frontend/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o frontend .

 CMD ["/app/frontend"]
--- a/tutorials/custom_evaluator/solution/matchfunction/Dockerfile
+++ b/tutorials/custom_evaluator/solution/matchfunction/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o matchfunction .

 CMD ["/app/matchfunction"]
--- a/tutorials/default_evaluator/director/Dockerfile
+++ b/tutorials/default_evaluator/director/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o director .

 CMD ["/app/director"]
--- a/tutorials/default_evaluator/frontend/Dockerfile
+++ b/tutorials/default_evaluator/frontend/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o frontend .

 CMD ["/app/frontend"]
--- a/tutorials/default_evaluator/matchfunction/Dockerfile
+++ b/tutorials/default_evaluator/matchfunction/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o matchfunction .

 CMD ["/app/matchfunction"]
--- a/tutorials/default_evaluator/solution/director/Dockerfile
+++ b/tutorials/default_evaluator/solution/director/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o director .

 CMD ["/app/director"]
--- a/tutorials/default_evaluator/solution/frontend/Dockerfile
+++ b/tutorials/default_evaluator/solution/frontend/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o frontend .

 CMD ["/app/frontend"]
--- a/tutorials/default_evaluator/solution/matchfunction/Dockerfile
+++ b/tutorials/default_evaluator/solution/matchfunction/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o matchfunction .

 CMD ["/app/matchfunction"]
--- a/tutorials/matchmaker101/director/Dockerfile
+++ b/tutorials/matchmaker101/director/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o director .

 CMD ["/app/director"]
--- a/tutorials/matchmaker101/frontend/Dockerfile
+++ b/tutorials/matchmaker101/frontend/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o frontend .

 CMD ["/app/frontend"]
--- a/tutorials/matchmaker101/frontend/main.go
+++ b/tutorials/matchmaker101/frontend/main.go
@ -14,7 +14,7 @@

 package main

-// The Frontend in this tutorial continuously creates Tickets in batches in Open Match.
+// The Frontend in this tutorial continously creates Tickets in batches in Open Match.

 import (
 	"context"
--- a/tutorials/matchmaker101/matchfunction/Dockerfile
+++ b/tutorials/matchmaker101/matchfunction/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o matchfunction .

 CMD ["/app/matchfunction"]
--- a/tutorials/matchmaker101/solution/director/Dockerfile
+++ b/tutorials/matchmaker101/solution/director/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o director .

 CMD ["/app/director"]
--- a/tutorials/matchmaker101/solution/frontend/Dockerfile
+++ b/tutorials/matchmaker101/solution/frontend/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o frontend .

 CMD ["/app/frontend"]
--- a/tutorials/matchmaker101/solution/matchfunction/Dockerfile
+++ b/tutorials/matchmaker101/solution/matchfunction/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o matchfunction .

 CMD ["/app/matchfunction"]
--- a/tutorials/matchmaker101/solution/matchfunction/mmf/matchfunction.go
+++ b/tutorials/matchmaker101/solution/matchfunction/mmf/matchfunction.go
@ -17,8 +17,7 @@ package mmf
 import (
 	"fmt"
 	"log"
-
-	"github.com/rs/xid"
+	"time"

 	"open-match.dev/open-match/pkg/matchfunction"
 	"open-match.dev/open-match/pkg/pb"
@ -65,6 +64,7 @@ func (s *MatchFunctionService) Run(req *pb.RunRequest, stream pb.MatchFunction_R

 func makeMatches(p *pb.MatchProfile, poolTickets map[string][]*pb.Ticket) ([]*pb.Match, error) {
 	var matches []*pb.Match
+	count := 0
 	for {
 		insufficientTickets := false
 		matchTickets := []*pb.Ticket{}
@ -85,11 +85,13 @@ func makeMatches(p *pb.MatchProfile, poolTickets map[string][]*pb.Ticket) ([]*pb
 		}

 		matches = append(matches, &pb.Match{
-			MatchId:       fmt.Sprintf("profile-%v-%s", p.GetName(), xid.New().String()),
+			MatchId:       fmt.Sprintf("profile-%v-time-%v-%v", p.GetName(), time.Now().Format("2006-01-02T15:04:05.00"), count),
 			MatchProfile:  p.GetName(),
 			MatchFunction: matchName,
 			Tickets:       matchTickets,
 		})
+
+		count++
 	}

 	return matches, nil
--- a/tutorials/matchmaker102/director/Dockerfile
+++ b/tutorials/matchmaker102/director/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o director .

 CMD ["/app/director"]
--- a/tutorials/matchmaker102/frontend/Dockerfile
+++ b/tutorials/matchmaker102/frontend/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o frontend .

 CMD ["/app/frontend"]
--- a/tutorials/matchmaker102/matchfunction/Dockerfile
+++ b/tutorials/matchmaker102/matchfunction/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o matchfunction .

 CMD ["/app/matchfunction"]
--- a/tutorials/matchmaker102/solution/director/Dockerfile
+++ b/tutorials/matchmaker102/solution/director/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o director .

 CMD ["/app/director"]
--- a/tutorials/matchmaker102/solution/frontend/Dockerfile
+++ b/tutorials/matchmaker102/solution/frontend/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o frontend .

 CMD ["/app/frontend"]
--- a/tutorials/matchmaker102/solution/matchfunction/Dockerfile
+++ b/tutorials/matchmaker102/solution/matchfunction/Dockerfile
@ -17,8 +17,6 @@ WORKDIR /app
 ENV GO111MODULE=on

 COPY . .
-RUN go mod edit -replace open-match.dev/open-match@v0.0.0-dev=open-match.dev/open-match@v1.6.0
-RUN go mod tidy
 RUN go build -o matchfunction .

 CMD ["/app/matchfunction"]