From 7850c8a76b83c94b3dcc94ac4b1518a68e7fe8bb Mon Sep 17 00:00:00 2001
From: Graham Plata <graham.plata@gmail.com>
Date: Thu, 23 Jan 2025 09:46:06 -0500
Subject: [PATCH 01/48] check admin for resource listing

---
 runtime/server/controller.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/runtime/server/controller.go b/runtime/server/controller.go
index d368fd5ac6a..3ce8d175280 100644
--- a/runtime/server/controller.go
+++ b/runtime/server/controller.go
@@ -61,6 +61,10 @@ func (s *Server) ListResources(ctx context.Context, req *runtimev1.ListResources
 		return strings.Compare(an.Name, bn.Name)
 	})
 
+	// Check if the requester is an admin
+	claims := auth.GetClaims(ctx)
+	isAdmin := claims.SecurityClaims().Admin()
+
 	i := 0
 	for i < len(rs) {
 		r := rs[i]
@@ -68,10 +72,10 @@ func (s *Server) ListResources(ctx context.Context, req *runtimev1.ListResources
 		if err != nil {
 			return nil, status.Error(codes.InvalidArgument, err.Error())
 		}
-		if !access {
+		// Admins can see all resources, even if they don't have access.
+		if !isAdmin && !access {
 			// Remove from the slice
 			rs[i] = rs[len(rs)-1]
-			rs[len(rs)-1] = nil
 			rs = rs[:len(rs)-1]
 			continue
 		}

From bcfaedbfc84f459847c0d1372f28788857be1eb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Egelund-M=C3=BCller?= <b@egelund-muller.com>
Date: Thu, 23 Jan 2025 15:17:56 +0000
Subject: [PATCH 02/48] Support `filters: enable:` in the canvas YAML (#6485)

* Support `filters: enable:` in the canvas YAML

* Set to true by default
---
 proto/gen/rill/runtime/v1/resources.pb.go     | 459 +++++++++---------
 .../rill/runtime/v1/resources.pb.validate.go  |   2 +
 .../gen/rill/runtime/v1/runtime.swagger.yaml  |   3 +
 proto/rill/runtime/v1/resources.proto         |   2 +
 runtime/compilers/rillv1/parse_canvas.go      |   9 +-
 runtime/compilers/rillv1/parser_test.go       |  11 +-
 .../proto/gen/rill/runtime/v1/resources_pb.ts |   8 +
 .../src/runtime-client/gen/index.schemas.ts   |   2 +
 8 files changed, 269 insertions(+), 227 deletions(-)

diff --git a/proto/gen/rill/runtime/v1/resources.pb.go b/proto/gen/rill/runtime/v1/resources.pb.go
index 213b39d01d1..8d0188c13a2 100644
--- a/proto/gen/rill/runtime/v1/resources.pb.go
+++ b/proto/gen/rill/runtime/v1/resources.pb.go
@@ -5391,6 +5391,8 @@ type CanvasSpec struct {
 	// If the list is empty, a default list should be shown.
 	// The values should be valid IANA location identifiers.
 	TimeZones []string `protobuf:"bytes,12,rep,name=time_zones,json=timeZones,proto3" json:"time_zones,omitempty"`
+	// Indicates if filters should be enabled for the canvas.
+	FiltersEnabled bool `protobuf:"varint,13,opt,name=filters_enabled,json=filtersEnabled,proto3" json:"filters_enabled,omitempty"`
 	// Preset UI state to show by default.
 	DefaultPreset *CanvasPreset `protobuf:"bytes,15,opt,name=default_preset,json=defaultPreset,proto3" json:"default_preset,omitempty"`
 	// Variables that can be used in the canvas.
@@ -5489,6 +5491,13 @@ func (x *CanvasSpec) GetTimeZones() []string {
 	return nil
 }
 
+func (x *CanvasSpec) GetFiltersEnabled() bool {
+	if x != nil {
+		return x.FiltersEnabled
+	}
+	return false
+}
+
 func (x *CanvasSpec) GetDefaultPreset() *CanvasPreset {
 	if x != nil {
 		return x.DefaultPreset
@@ -8072,7 +8081,7 @@ var file_rill_runtime_v1_resources_proto_rawDesc = []byte{
 	0x70, 0x65, 0x63, 0x52, 0x04, 0x73, 0x70, 0x65, 0x63, 0x12, 0x32, 0x0a, 0x05, 0x73, 0x74, 0x61,
 	0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
 	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x6e, 0x76, 0x61,
-	0x73, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, 0xb3, 0x04,
+	0x73, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, 0xdc, 0x04,
 	0x0a, 0x0a, 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x53, 0x70, 0x65, 0x63, 0x12, 0x21, 0x0a, 0x0c,
 	0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12,
@@ -8092,234 +8101,236 @@ var file_rill_runtime_v1_resources_proto_rawDesc = []byte{
 	0x6d, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x52, 0x61, 0x6e,
 	0x67, 0x65, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x7a, 0x6f, 0x6e, 0x65,
 	0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x5a, 0x6f, 0x6e,
-	0x65, 0x73, 0x12, 0x44, 0x0a, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x70, 0x72,
-	0x65, 0x73, 0x65, 0x74, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c,
-	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x6e,
-	0x76, 0x61, 0x73, 0x50, 0x72, 0x65, 0x73, 0x65, 0x74, 0x52, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75,
-	0x6c, 0x74, 0x50, 0x72, 0x65, 0x73, 0x65, 0x74, 0x12, 0x40, 0x0a, 0x09, 0x76, 0x61, 0x72, 0x69,
-	0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x72, 0x69,
-	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f,
-	0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52,
-	0x09, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x31, 0x0a, 0x05, 0x69, 0x74,
-	0x65, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
-	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x6e, 0x76,
-	0x61, 0x73, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x44, 0x0a,
-	0x0e, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18,
-	0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79,
-	0x52, 0x75, 0x6c, 0x65, 0x52, 0x0d, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x52, 0x75,
-	0x6c, 0x65, 0x73, 0x22, 0x49, 0x0a, 0x0b, 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x53, 0x74, 0x61,
-	0x74, 0x65, 0x12, 0x3a, 0x0a, 0x0a, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x5f, 0x73, 0x70, 0x65, 0x63,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x53,
-	0x70, 0x65, 0x63, 0x52, 0x09, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x53, 0x70, 0x65, 0x63, 0x22, 0xd5,
-	0x01, 0x0a, 0x0a, 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x1c, 0x0a,
-	0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x12, 0x2a, 0x0a, 0x11, 0x64,
-	0x65, 0x66, 0x69, 0x6e, 0x65, 0x64, 0x5f, 0x69, 0x6e, 0x5f, 0x63, 0x61, 0x6e, 0x76, 0x61, 0x73,
-	0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x65, 0x64, 0x49,
-	0x6e, 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x12, 0x11, 0x0a, 0x01, 0x78, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0d, 0x48, 0x00, 0x52, 0x01, 0x78, 0x88, 0x01, 0x01, 0x12, 0x11, 0x0a, 0x01, 0x79, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x01, 0x52, 0x01, 0x79, 0x88, 0x01, 0x01, 0x12, 0x19, 0x0a,
-	0x05, 0x77, 0x69, 0x64, 0x74, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x02, 0x52, 0x05,
-	0x77, 0x69, 0x64, 0x74, 0x68, 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67,
-	0x68, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x03, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67,
-	0x68, 0x74, 0x88, 0x01, 0x01, 0x42, 0x04, 0x0a, 0x02, 0x5f, 0x78, 0x42, 0x04, 0x0a, 0x02, 0x5f,
-	0x79, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x42, 0x09, 0x0a, 0x07, 0x5f,
-	0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0xe3, 0x01, 0x0a, 0x0c, 0x43, 0x61, 0x6e, 0x76, 0x61,
-	0x73, 0x50, 0x72, 0x65, 0x73, 0x65, 0x74, 0x12, 0x22, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x5f,
-	0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x09, 0x74,
-	0x69, 0x6d, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x88, 0x01, 0x01, 0x12, 0x4f, 0x0a, 0x0f, 0x63,
-	0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69, 0x73, 0x6f, 0x6e, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0e, 0x32, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x43, 0x6f,
-	0x6d, 0x70, 0x61, 0x72, 0x69, 0x73, 0x6f, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x0e, 0x63, 0x6f,
-	0x6d, 0x70, 0x61, 0x72, 0x69, 0x73, 0x6f, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x36, 0x0a, 0x14,
-	0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69, 0x73, 0x6f, 0x6e, 0x5f, 0x64, 0x69, 0x6d, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x13, 0x63, 0x6f,
-	0x6d, 0x70, 0x61, 0x72, 0x69, 0x73, 0x6f, 0x6e, 0x44, 0x69, 0x6d, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x72, 0x61,
-	0x6e, 0x67, 0x65, 0x42, 0x17, 0x0a, 0x15, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69, 0x73,
-	0x6f, 0x6e, 0x5f, 0x64, 0x69, 0x6d, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x64, 0x0a, 0x03,
-	0x41, 0x50, 0x49, 0x12, 0x2c, 0x0a, 0x04, 0x73, 0x70, 0x65, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x18, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x41, 0x50, 0x49, 0x53, 0x70, 0x65, 0x63, 0x52, 0x04, 0x73, 0x70, 0x65,
-	0x63, 0x12, 0x2f, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x19, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
-	0x76, 0x31, 0x2e, 0x41, 0x50, 0x49, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x22, 0xa9, 0x03, 0x0a, 0x07, 0x41, 0x50, 0x49, 0x53, 0x70, 0x65, 0x63, 0x12, 0x1a,
-	0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x12, 0x48, 0x0a, 0x13, 0x72, 0x65,
-	0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65,
-	0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74,
-	0x52, 0x12, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
-	0x74, 0x69, 0x65, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x5f,
-	0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f,
-	0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x53, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x46, 0x0a,
-	0x12, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74,
-	0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75,
-	0x63, 0x74, 0x52, 0x11, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x50, 0x61, 0x72, 0x61, 0x6d,
-	0x65, 0x74, 0x65, 0x72, 0x73, 0x12, 0x4f, 0x0a, 0x17, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69,
-	0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52,
-	0x15, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x44, 0x0a, 0x0e, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69,
+	0x65, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x5f, 0x65, 0x6e,
+	0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x66, 0x69, 0x6c,
+	0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x44, 0x0a, 0x0e, 0x64,
+	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x70, 0x72, 0x65, 0x73, 0x65, 0x74, 0x18, 0x0f, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x50, 0x72, 0x65, 0x73,
+	0x65, 0x74, 0x52, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x50, 0x72, 0x65, 0x73, 0x65,
+	0x74, 0x12, 0x40, 0x0a, 0x09, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x05,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
+	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74,
+	0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x09, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62,
+	0x6c, 0x65, 0x73, 0x12, 0x31, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x49, 0x74, 0x65, 0x6d, 0x52,
+	0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x44, 0x0a, 0x0e, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69,
 	0x74, 0x79, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d,
 	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
 	0x2e, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0d, 0x73,
-	0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x30, 0x0a, 0x14,
-	0x73, 0x6b, 0x69, 0x70, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x65, 0x63, 0x75,
-	0x72, 0x69, 0x74, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x73, 0x6b, 0x69, 0x70,
-	0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x22, 0x0a,
-	0x0a, 0x08, 0x41, 0x50, 0x49, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x9b, 0x01, 0x0a, 0x08, 0x53,
-	0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x66, 0x5f, 0x75,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x72, 0x65, 0x66,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c,
-	0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65,
-	0x12, 0x12, 0x0a, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x63, 0x72, 0x6f, 0x6e, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x72, 0x5f, 0x73,
-	0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0d, 0x74, 0x69,
-	0x63, 0x6b, 0x65, 0x72, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x74,
-	0x69, 0x6d, 0x65, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
-	0x74, 0x69, 0x6d, 0x65, 0x5a, 0x6f, 0x6e, 0x65, 0x22, 0xa5, 0x01, 0x0a, 0x0a, 0x50, 0x61, 0x72,
-	0x73, 0x65, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x12, 0x1b, 0x0a, 0x09, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x44,
-	0x0a, 0x0e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x68, 0x61, 0x72, 0x4c, 0x6f, 0x63,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x4c, 0x6f, 0x63, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x22, 0x50, 0x0a, 0x0f, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x72,
-	0x72, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x23, 0x0a,
-	0x0d, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, 0x61,
-	0x74, 0x68, 0x22, 0x4b, 0x0a, 0x0f, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79,
-	0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12,
-	0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x22,
-	0x2a, 0x0a, 0x0e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x6f,
-	0x72, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x22, 0x0a, 0x0c, 0x43,
-	0x68, 0x61, 0x72, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6c,
-	0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x22,
-	0x78, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x56, 0x32, 0x12, 0x32,
-	0x0a, 0x04, 0x73, 0x70, 0x65, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x72,
-	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x53, 0x70, 0x65, 0x63, 0x52, 0x04, 0x73, 0x70,
-	0x65, 0x63, 0x12, 0x35, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x53, 0x74, 0x61,
-	0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, 0x8c, 0x04, 0x0a, 0x0d, 0x43, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x53, 0x70, 0x65, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x64,
-	0x72, 0x69, 0x76, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x72, 0x69,
-	0x76, 0x65, 0x72, 0x12, 0x4e, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65,
-	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x6f, 0x72, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69,
-	0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
-	0x69, 0x65, 0x73, 0x12, 0x31, 0x0a, 0x14, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x64,
-	0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x13, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x64, 0x50, 0x72, 0x6f, 0x70,
-	0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73,
-	0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x76, 0x69,
-	0x73, 0x69, 0x6f, 0x6e, 0x12, 0x3e, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f,
-	0x6e, 0x5f, 0x61, 0x72, 0x67, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53,
-	0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e,
-	0x41, 0x72, 0x67, 0x73, 0x12, 0x77, 0x0a, 0x19, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69,
-	0x65, 0x73, 0x5f, 0x66, 0x72, 0x6f, 0x6d, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65,
-	0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x6f, 0x72, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69,
-	0x65, 0x73, 0x46, 0x72, 0x6f, 0x6d, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x17, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73,
-	0x46, 0x72, 0x6f, 0x6d, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x1a, 0x3d, 0x0a,
-	0x0f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 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, 0x1a, 0x4a, 0x0a, 0x1c,
-	0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x46, 0x72, 0x6f, 0x6d, 0x56, 0x61,
-	0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 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, 0x2d, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x6f, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x70,
-	0x65, 0x63, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73,
-	0x70, 0x65, 0x63, 0x48, 0x61, 0x73, 0x68, 0x2a, 0x8a, 0x01, 0x0a, 0x0f, 0x52, 0x65, 0x63, 0x6f,
-	0x6e, 0x63, 0x69, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x20, 0x0a, 0x1c, 0x52,
-	0x45, 0x43, 0x4f, 0x4e, 0x43, 0x49, 0x4c, 0x45, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f,
-	0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x19, 0x0a,
-	0x15, 0x52, 0x45, 0x43, 0x4f, 0x4e, 0x43, 0x49, 0x4c, 0x45, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55,
-	0x53, 0x5f, 0x49, 0x44, 0x4c, 0x45, 0x10, 0x01, 0x12, 0x1c, 0x0a, 0x18, 0x52, 0x45, 0x43, 0x4f,
-	0x4e, 0x43, 0x49, 0x4c, 0x45, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x50, 0x45, 0x4e,
-	0x44, 0x49, 0x4e, 0x47, 0x10, 0x02, 0x12, 0x1c, 0x0a, 0x18, 0x52, 0x45, 0x43, 0x4f, 0x4e, 0x43,
-	0x49, 0x4c, 0x45, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x52, 0x55, 0x4e, 0x4e, 0x49,
-	0x4e, 0x47, 0x10, 0x03, 0x2a, 0xab, 0x01, 0x0a, 0x15, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65,
-	0x43, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69, 0x73, 0x6f, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x27,
-	0x0a, 0x23, 0x45, 0x58, 0x50, 0x4c, 0x4f, 0x52, 0x45, 0x5f, 0x43, 0x4f, 0x4d, 0x50, 0x41, 0x52,
-	0x49, 0x53, 0x4f, 0x4e, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43,
-	0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x20, 0x0a, 0x1c, 0x45, 0x58, 0x50, 0x4c, 0x4f,
+	0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x22, 0x49, 0x0a, 0x0b,
+	0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x3a, 0x0a, 0x0a, 0x76,
+	0x61, 0x6c, 0x69, 0x64, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x1b, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
+	0x31, 0x2e, 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x53, 0x70, 0x65, 0x63, 0x52, 0x09, 0x76, 0x61,
+	0x6c, 0x69, 0x64, 0x53, 0x70, 0x65, 0x63, 0x22, 0xd5, 0x01, 0x0a, 0x0a, 0x43, 0x61, 0x6e, 0x76,
+	0x61, 0x73, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e,
+	0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6f,
+	0x6e, 0x65, 0x6e, 0x74, 0x12, 0x2a, 0x0a, 0x11, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x65, 0x64, 0x5f,
+	0x69, 0x6e, 0x5f, 0x63, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x0f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x65, 0x64, 0x49, 0x6e, 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73,
+	0x12, 0x11, 0x0a, 0x01, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x01, 0x78,
+	0x88, 0x01, 0x01, 0x12, 0x11, 0x0a, 0x01, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x01,
+	0x52, 0x01, 0x79, 0x88, 0x01, 0x01, 0x12, 0x19, 0x0a, 0x05, 0x77, 0x69, 0x64, 0x74, 0x68, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x02, 0x52, 0x05, 0x77, 0x69, 0x64, 0x74, 0x68, 0x88, 0x01,
+	0x01, 0x12, 0x1b, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x0d, 0x48, 0x03, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x88, 0x01, 0x01, 0x42, 0x04,
+	0x0a, 0x02, 0x5f, 0x78, 0x42, 0x04, 0x0a, 0x02, 0x5f, 0x79, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x77,
+	0x69, 0x64, 0x74, 0x68, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22,
+	0xe3, 0x01, 0x0a, 0x0c, 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x50, 0x72, 0x65, 0x73, 0x65, 0x74,
+	0x12, 0x22, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x52, 0x61, 0x6e, 0x67,
+	0x65, 0x88, 0x01, 0x01, 0x12, 0x4f, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69, 0x73,
+	0x6f, 0x6e, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x26, 0x2e,
+	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
+	0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69, 0x73, 0x6f,
+	0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x0e, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69, 0x73, 0x6f,
+	0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x36, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69,
+	0x73, 0x6f, 0x6e, 0x5f, 0x64, 0x69, 0x6d, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20,
+	0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x13, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69, 0x73, 0x6f,
+	0x6e, 0x44, 0x69, 0x6d, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a,
+	0x0b, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x42, 0x17, 0x0a, 0x15,
+	0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69, 0x73, 0x6f, 0x6e, 0x5f, 0x64, 0x69, 0x6d, 0x65,
+	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x64, 0x0a, 0x03, 0x41, 0x50, 0x49, 0x12, 0x2c, 0x0a, 0x04,
+	0x73, 0x70, 0x65, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x72, 0x69, 0x6c,
+	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x50, 0x49,
+	0x53, 0x70, 0x65, 0x63, 0x52, 0x04, 0x73, 0x70, 0x65, 0x63, 0x12, 0x2f, 0x0a, 0x05, 0x73, 0x74,
+	0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
+	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x50, 0x49, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, 0xa9, 0x03, 0x0a, 0x07,
+	0x41, 0x50, 0x49, 0x53, 0x70, 0x65, 0x63, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x6c,
+	0x76, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x6c,
+	0x76, 0x65, 0x72, 0x12, 0x48, 0x0a, 0x13, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x5f,
+	0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x12, 0x72, 0x65, 0x73, 0x6f, 0x6c,
+	0x76, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, 0x27, 0x0a,
+	0x0f, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x5f, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x53,
+	0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x46, 0x0a, 0x12, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70,
+	0x69, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x11, 0x6f, 0x70, 0x65,
+	0x6e, 0x61, 0x70, 0x69, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x12, 0x4f,
+	0x0a, 0x17, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x15, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70,
+	0x69, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12,
+	0x44, 0x0a, 0x0e, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x72, 0x75, 0x6c, 0x65,
+	0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69,
+	0x74, 0x79, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0d, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79,
+	0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x30, 0x0a, 0x14, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x6e, 0x65,
+	0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x18, 0x07, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x12, 0x73, 0x6b, 0x69, 0x70, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x53,
+	0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x22, 0x0a, 0x0a, 0x08, 0x41, 0x50, 0x49, 0x53, 0x74,
+	0x61, 0x74, 0x65, 0x22, 0x9b, 0x01, 0x0a, 0x08, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65,
+	0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x66, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x72, 0x65, 0x66, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12,
+	0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x07, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x72, 0x6f,
+	0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x12, 0x25, 0x0a,
+	0x0e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0d, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x72, 0x53, 0x65, 0x63,
+	0x6f, 0x6e, 0x64, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x7a, 0x6f, 0x6e,
+	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x69, 0x6d, 0x65, 0x5a, 0x6f, 0x6e,
+	0x65, 0x22, 0xa5, 0x01, 0x0a, 0x0a, 0x50, 0x61, 0x72, 0x73, 0x65, 0x45, 0x72, 0x72, 0x6f, 0x72,
+	0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x66, 0x69,
+	0x6c, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66,
+	0x69, 0x6c, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x44, 0x0a, 0x0e, 0x73, 0x74, 0x61, 0x72, 0x74,
+	0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
+	0x31, 0x2e, 0x43, 0x68, 0x61, 0x72, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d,
+	0x73, 0x74, 0x61, 0x72, 0x74, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a,
+	0x08, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x08, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x22, 0x50, 0x0a, 0x0f, 0x56, 0x61, 0x6c,
+	0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07,
+	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72,
+	0x74, 0x79, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x70,
+	0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, 0x61, 0x74, 0x68, 0x22, 0x4b, 0x0a, 0x0f, 0x44,
+	0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x18,
+	0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x65,
+	0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x65,
+	0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x22, 0x2a, 0x0a, 0x0e, 0x45, 0x78, 0x65, 0x63,
+	0x75, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65,
+	0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73,
+	0x73, 0x61, 0x67, 0x65, 0x22, 0x22, 0x0a, 0x0c, 0x43, 0x68, 0x61, 0x72, 0x4c, 0x6f, 0x63, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0d, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x78, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x6f, 0x72, 0x56, 0x32, 0x12, 0x32, 0x0a, 0x04, 0x73, 0x70, 0x65, 0x63, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f,
+	0x72, 0x53, 0x70, 0x65, 0x63, 0x52, 0x04, 0x73, 0x70, 0x65, 0x63, 0x12, 0x35, 0x0a, 0x05, 0x73,
+	0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x72, 0x69, 0x6c,
+	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61,
+	0x74, 0x65, 0x22, 0x8c, 0x04, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
+	0x53, 0x70, 0x65, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x12, 0x4e, 0x0a, 0x0a,
+	0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x2e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+	0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x53, 0x70, 0x65, 0x63,
+	0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x52, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, 0x31, 0x0a, 0x14,
+	0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72,
+	0x74, 0x69, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x13, 0x74, 0x65, 0x6d, 0x70,
+	0x6c, 0x61, 0x74, 0x65, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12,
+	0x1c, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x3e, 0x0a,
+	0x0e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x72, 0x67, 0x73, 0x18,
+	0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x0d,
+	0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x41, 0x72, 0x67, 0x73, 0x12, 0x77, 0x0a,
+	0x19, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x5f, 0x66, 0x72, 0x6f, 0x6d,
+	0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x3b, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+	0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x53, 0x70, 0x65, 0x63,
+	0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x46, 0x72, 0x6f, 0x6d, 0x56,
+	0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x17, 0x70,
+	0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x46, 0x72, 0x6f, 0x6d, 0x56, 0x61, 0x72,
+	0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x1a, 0x3d, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
+	0x74, 0x69, 0x65, 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, 0x1a, 0x4a, 0x0a, 0x1c, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
+	0x69, 0x65, 0x73, 0x46, 0x72, 0x6f, 0x6d, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 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, 0x2d, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x53, 0x74,
+	0x61, 0x74, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x70, 0x65, 0x63, 0x5f, 0x68, 0x61, 0x73, 0x68,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x70, 0x65, 0x63, 0x48, 0x61, 0x73, 0x68,
+	0x2a, 0x8a, 0x01, 0x0a, 0x0f, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x63, 0x69, 0x6c, 0x65, 0x53, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x12, 0x20, 0x0a, 0x1c, 0x52, 0x45, 0x43, 0x4f, 0x4e, 0x43, 0x49, 0x4c,
+	0x45, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49,
+	0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x52, 0x45, 0x43, 0x4f, 0x4e, 0x43,
+	0x49, 0x4c, 0x45, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x49, 0x44, 0x4c, 0x45, 0x10,
+	0x01, 0x12, 0x1c, 0x0a, 0x18, 0x52, 0x45, 0x43, 0x4f, 0x4e, 0x43, 0x49, 0x4c, 0x45, 0x5f, 0x53,
+	0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x50, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x02, 0x12,
+	0x1c, 0x0a, 0x18, 0x52, 0x45, 0x43, 0x4f, 0x4e, 0x43, 0x49, 0x4c, 0x45, 0x5f, 0x53, 0x54, 0x41,
+	0x54, 0x55, 0x53, 0x5f, 0x52, 0x55, 0x4e, 0x4e, 0x49, 0x4e, 0x47, 0x10, 0x03, 0x2a, 0xab, 0x01,
+	0x0a, 0x15, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69,
+	0x73, 0x6f, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x27, 0x0a, 0x23, 0x45, 0x58, 0x50, 0x4c, 0x4f,
 	0x52, 0x45, 0x5f, 0x43, 0x4f, 0x4d, 0x50, 0x41, 0x52, 0x49, 0x53, 0x4f, 0x4e, 0x5f, 0x4d, 0x4f,
-	0x44, 0x45, 0x5f, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x01, 0x12, 0x20, 0x0a, 0x1c, 0x45, 0x58, 0x50,
-	0x4c, 0x4f, 0x52, 0x45, 0x5f, 0x43, 0x4f, 0x4d, 0x50, 0x41, 0x52, 0x49, 0x53, 0x4f, 0x4e, 0x5f,
-	0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x54, 0x49, 0x4d, 0x45, 0x10, 0x02, 0x12, 0x25, 0x0a, 0x21, 0x45,
-	0x58, 0x50, 0x4c, 0x4f, 0x52, 0x45, 0x5f, 0x43, 0x4f, 0x4d, 0x50, 0x41, 0x52, 0x49, 0x53, 0x4f,
-	0x4e, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x44, 0x49, 0x4d, 0x45, 0x4e, 0x53, 0x49, 0x4f, 0x4e,
-	0x10, 0x03, 0x2a, 0xae, 0x01, 0x0a, 0x0e, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x57, 0x65,
-	0x62, 0x56, 0x69, 0x65, 0x77, 0x12, 0x20, 0x0a, 0x1c, 0x45, 0x58, 0x50, 0x4c, 0x4f, 0x52, 0x45,
-	0x5f, 0x57, 0x45, 0x42, 0x5f, 0x56, 0x49, 0x45, 0x57, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43,
-	0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1c, 0x0a, 0x18, 0x45, 0x58, 0x50, 0x4c, 0x4f,
-	0x52, 0x45, 0x5f, 0x57, 0x45, 0x42, 0x5f, 0x56, 0x49, 0x45, 0x57, 0x5f, 0x45, 0x58, 0x50, 0x4c,
-	0x4f, 0x52, 0x45, 0x10, 0x01, 0x12, 0x23, 0x0a, 0x1f, 0x45, 0x58, 0x50, 0x4c, 0x4f, 0x52, 0x45,
-	0x5f, 0x57, 0x45, 0x42, 0x5f, 0x56, 0x49, 0x45, 0x57, 0x5f, 0x54, 0x49, 0x4d, 0x45, 0x5f, 0x44,
-	0x49, 0x4d, 0x45, 0x4e, 0x53, 0x49, 0x4f, 0x4e, 0x10, 0x02, 0x12, 0x1a, 0x0a, 0x16, 0x45, 0x58,
-	0x50, 0x4c, 0x4f, 0x52, 0x45, 0x5f, 0x57, 0x45, 0x42, 0x5f, 0x56, 0x49, 0x45, 0x57, 0x5f, 0x50,
-	0x49, 0x56, 0x4f, 0x54, 0x10, 0x03, 0x12, 0x1b, 0x0a, 0x17, 0x45, 0x58, 0x50, 0x4c, 0x4f, 0x52,
-	0x45, 0x5f, 0x57, 0x45, 0x42, 0x5f, 0x56, 0x49, 0x45, 0x57, 0x5f, 0x43, 0x41, 0x4e, 0x56, 0x41,
-	0x53, 0x10, 0x04, 0x2a, 0xdc, 0x01, 0x0a, 0x0f, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x53,
-	0x6f, 0x72, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x1d, 0x45, 0x58, 0x50, 0x4c, 0x4f,
-	0x52, 0x45, 0x5f, 0x53, 0x4f, 0x52, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53,
-	0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1b, 0x0a, 0x17, 0x45, 0x58,
+	0x44, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00,
+	0x12, 0x20, 0x0a, 0x1c, 0x45, 0x58, 0x50, 0x4c, 0x4f, 0x52, 0x45, 0x5f, 0x43, 0x4f, 0x4d, 0x50,
+	0x41, 0x52, 0x49, 0x53, 0x4f, 0x4e, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x4e, 0x4f, 0x4e, 0x45,
+	0x10, 0x01, 0x12, 0x20, 0x0a, 0x1c, 0x45, 0x58, 0x50, 0x4c, 0x4f, 0x52, 0x45, 0x5f, 0x43, 0x4f,
+	0x4d, 0x50, 0x41, 0x52, 0x49, 0x53, 0x4f, 0x4e, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x54, 0x49,
+	0x4d, 0x45, 0x10, 0x02, 0x12, 0x25, 0x0a, 0x21, 0x45, 0x58, 0x50, 0x4c, 0x4f, 0x52, 0x45, 0x5f,
+	0x43, 0x4f, 0x4d, 0x50, 0x41, 0x52, 0x49, 0x53, 0x4f, 0x4e, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f,
+	0x44, 0x49, 0x4d, 0x45, 0x4e, 0x53, 0x49, 0x4f, 0x4e, 0x10, 0x03, 0x2a, 0xae, 0x01, 0x0a, 0x0e,
+	0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x57, 0x65, 0x62, 0x56, 0x69, 0x65, 0x77, 0x12, 0x20,
+	0x0a, 0x1c, 0x45, 0x58, 0x50, 0x4c, 0x4f, 0x52, 0x45, 0x5f, 0x57, 0x45, 0x42, 0x5f, 0x56, 0x49,
+	0x45, 0x57, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00,
+	0x12, 0x1c, 0x0a, 0x18, 0x45, 0x58, 0x50, 0x4c, 0x4f, 0x52, 0x45, 0x5f, 0x57, 0x45, 0x42, 0x5f,
+	0x56, 0x49, 0x45, 0x57, 0x5f, 0x45, 0x58, 0x50, 0x4c, 0x4f, 0x52, 0x45, 0x10, 0x01, 0x12, 0x23,
+	0x0a, 0x1f, 0x45, 0x58, 0x50, 0x4c, 0x4f, 0x52, 0x45, 0x5f, 0x57, 0x45, 0x42, 0x5f, 0x56, 0x49,
+	0x45, 0x57, 0x5f, 0x54, 0x49, 0x4d, 0x45, 0x5f, 0x44, 0x49, 0x4d, 0x45, 0x4e, 0x53, 0x49, 0x4f,
+	0x4e, 0x10, 0x02, 0x12, 0x1a, 0x0a, 0x16, 0x45, 0x58, 0x50, 0x4c, 0x4f, 0x52, 0x45, 0x5f, 0x57,
+	0x45, 0x42, 0x5f, 0x56, 0x49, 0x45, 0x57, 0x5f, 0x50, 0x49, 0x56, 0x4f, 0x54, 0x10, 0x03, 0x12,
+	0x1b, 0x0a, 0x17, 0x45, 0x58, 0x50, 0x4c, 0x4f, 0x52, 0x45, 0x5f, 0x57, 0x45, 0x42, 0x5f, 0x56,
+	0x49, 0x45, 0x57, 0x5f, 0x43, 0x41, 0x4e, 0x56, 0x41, 0x53, 0x10, 0x04, 0x2a, 0xdc, 0x01, 0x0a,
+	0x0f, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x53, 0x6f, 0x72, 0x74, 0x54, 0x79, 0x70, 0x65,
+	0x12, 0x21, 0x0a, 0x1d, 0x45, 0x58, 0x50, 0x4c, 0x4f, 0x52, 0x45, 0x5f, 0x53, 0x4f, 0x52, 0x54,
+	0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45,
+	0x44, 0x10, 0x00, 0x12, 0x1b, 0x0a, 0x17, 0x45, 0x58, 0x50, 0x4c, 0x4f, 0x52, 0x45, 0x5f, 0x53,
+	0x4f, 0x52, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x56, 0x41, 0x4c, 0x55, 0x45, 0x10, 0x01,
+	0x12, 0x1d, 0x0a, 0x19, 0x45, 0x58, 0x50, 0x4c, 0x4f, 0x52, 0x45, 0x5f, 0x53, 0x4f, 0x52, 0x54,
+	0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x45, 0x52, 0x43, 0x45, 0x4e, 0x54, 0x10, 0x02, 0x12,
+	0x23, 0x0a, 0x1f, 0x45, 0x58, 0x50, 0x4c, 0x4f, 0x52, 0x45, 0x5f, 0x53, 0x4f, 0x52, 0x54, 0x5f,
+	0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x45, 0x4c, 0x54, 0x41, 0x5f, 0x50, 0x45, 0x52, 0x43, 0x45,
+	0x4e, 0x54, 0x10, 0x03, 0x12, 0x24, 0x0a, 0x20, 0x45, 0x58, 0x50, 0x4c, 0x4f, 0x52, 0x45, 0x5f,
+	0x53, 0x4f, 0x52, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x45, 0x4c, 0x54, 0x41, 0x5f,
+	0x41, 0x42, 0x53, 0x4f, 0x4c, 0x55, 0x54, 0x45, 0x10, 0x04, 0x12, 0x1f, 0x0a, 0x1b, 0x45, 0x58,
 	0x50, 0x4c, 0x4f, 0x52, 0x45, 0x5f, 0x53, 0x4f, 0x52, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
-	0x56, 0x41, 0x4c, 0x55, 0x45, 0x10, 0x01, 0x12, 0x1d, 0x0a, 0x19, 0x45, 0x58, 0x50, 0x4c, 0x4f,
-	0x52, 0x45, 0x5f, 0x53, 0x4f, 0x52, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x45, 0x52,
-	0x43, 0x45, 0x4e, 0x54, 0x10, 0x02, 0x12, 0x23, 0x0a, 0x1f, 0x45, 0x58, 0x50, 0x4c, 0x4f, 0x52,
-	0x45, 0x5f, 0x53, 0x4f, 0x52, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x45, 0x4c, 0x54,
-	0x41, 0x5f, 0x50, 0x45, 0x52, 0x43, 0x45, 0x4e, 0x54, 0x10, 0x03, 0x12, 0x24, 0x0a, 0x20, 0x45,
-	0x58, 0x50, 0x4c, 0x4f, 0x52, 0x45, 0x5f, 0x53, 0x4f, 0x52, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45,
-	0x5f, 0x44, 0x45, 0x4c, 0x54, 0x41, 0x5f, 0x41, 0x42, 0x53, 0x4f, 0x4c, 0x55, 0x54, 0x45, 0x10,
-	0x04, 0x12, 0x1f, 0x0a, 0x1b, 0x45, 0x58, 0x50, 0x4c, 0x4f, 0x52, 0x45, 0x5f, 0x53, 0x4f, 0x52,
-	0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x49, 0x4d, 0x45, 0x4e, 0x53, 0x49, 0x4f, 0x4e,
-	0x10, 0x05, 0x2a, 0x85, 0x01, 0x0a, 0x0f, 0x41, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x20, 0x0a, 0x1c, 0x41, 0x53, 0x53, 0x45, 0x52, 0x54,
-	0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45,
-	0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x41, 0x53, 0x53, 0x45,
-	0x52, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x50, 0x41, 0x53,
-	0x53, 0x10, 0x01, 0x12, 0x19, 0x0a, 0x15, 0x41, 0x53, 0x53, 0x45, 0x52, 0x54, 0x49, 0x4f, 0x4e,
-	0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x46, 0x41, 0x49, 0x4c, 0x10, 0x02, 0x12, 0x1a,
-	0x0a, 0x16, 0x41, 0x53, 0x53, 0x45, 0x52, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x54, 0x41, 0x54,
-	0x55, 0x53, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x03, 0x42, 0xc1, 0x01, 0x0a, 0x13, 0x63,
-	0x6f, 0x6d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
-	0x76, 0x31, 0x42, 0x0e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x72, 0x69, 0x6c, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x72, 0x69, 0x6c, 0x6c, 0x2f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x72, 0x69, 0x6c, 0x6c, 0x2f, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x76, 0x31, 0xa2, 0x02, 0x03, 0x52, 0x52, 0x58, 0xaa, 0x02, 0x0f, 0x52, 0x69, 0x6c, 0x6c, 0x2e,
-	0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0f, 0x52, 0x69, 0x6c,
-	0x6c, 0x5c, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1b, 0x52,
-	0x69, 0x6c, 0x6c, 0x5c, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47,
-	0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x11, 0x52, 0x69, 0x6c,
-	0x6c, 0x3a, 0x3a, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x44, 0x49, 0x4d, 0x45, 0x4e, 0x53, 0x49, 0x4f, 0x4e, 0x10, 0x05, 0x2a, 0x85, 0x01, 0x0a, 0x0f,
+	0x41, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12,
+	0x20, 0x0a, 0x1c, 0x41, 0x53, 0x53, 0x45, 0x52, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x54, 0x41,
+	0x54, 0x55, 0x53, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10,
+	0x00, 0x12, 0x19, 0x0a, 0x15, 0x41, 0x53, 0x53, 0x45, 0x52, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x53,
+	0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x50, 0x41, 0x53, 0x53, 0x10, 0x01, 0x12, 0x19, 0x0a, 0x15,
+	0x41, 0x53, 0x53, 0x45, 0x52, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53,
+	0x5f, 0x46, 0x41, 0x49, 0x4c, 0x10, 0x02, 0x12, 0x1a, 0x0a, 0x16, 0x41, 0x53, 0x53, 0x45, 0x52,
+	0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x45, 0x52, 0x52, 0x4f,
+	0x52, 0x10, 0x03, 0x42, 0xc1, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
+	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0e, 0x52, 0x65, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, 0x69, 0x6c, 0x6c, 0x64, 0x61,
+	0x74, 0x61, 0x2f, 0x72, 0x69, 0x6c, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65,
+	0x6e, 0x2f, 0x72, 0x69, 0x6c, 0x6c, 0x2f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x76,
+	0x31, 0x3b, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x52, 0x52,
+	0x58, 0xaa, 0x02, 0x0f, 0x52, 0x69, 0x6c, 0x6c, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x2e, 0x56, 0x31, 0xca, 0x02, 0x0f, 0x52, 0x69, 0x6c, 0x6c, 0x5c, 0x52, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1b, 0x52, 0x69, 0x6c, 0x6c, 0x5c, 0x52, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64,
+	0x61, 0x74, 0x61, 0xea, 0x02, 0x11, 0x52, 0x69, 0x6c, 0x6c, 0x3a, 0x3a, 0x52, 0x75, 0x6e, 0x74,
+	0x69, 0x6d, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/proto/gen/rill/runtime/v1/resources.pb.validate.go b/proto/gen/rill/runtime/v1/resources.pb.validate.go
index 61be9d39352..31692f55667 100644
--- a/proto/gen/rill/runtime/v1/resources.pb.validate.go
+++ b/proto/gen/rill/runtime/v1/resources.pb.validate.go
@@ -10300,6 +10300,8 @@ func (m *CanvasSpec) validate(all bool) error {
 
 	}
 
+	// no validation rules for FiltersEnabled
+
 	if all {
 		switch v := interface{}(m.GetDefaultPreset()).(type) {
 		case interface{ ValidateAll() error }:
diff --git a/proto/gen/rill/runtime/v1/runtime.swagger.yaml b/proto/gen/rill/runtime/v1/runtime.swagger.yaml
index c30e972805f..fd00a6a8eae 100644
--- a/proto/gen/rill/runtime/v1/runtime.swagger.yaml
+++ b/proto/gen/rill/runtime/v1/runtime.swagger.yaml
@@ -3617,6 +3617,9 @@ definitions:
           List of selectable time zones.
           If the list is empty, a default list should be shown.
           The values should be valid IANA location identifiers.
+      filtersEnabled:
+        type: boolean
+        description: Indicates if filters should be enabled for the canvas.
       defaultPreset:
         $ref: '#/definitions/v1CanvasPreset'
         description: Preset UI state to show by default.
diff --git a/proto/rill/runtime/v1/resources.proto b/proto/rill/runtime/v1/resources.proto
index 7222e1789be..39ac1e40ec0 100644
--- a/proto/rill/runtime/v1/resources.proto
+++ b/proto/rill/runtime/v1/resources.proto
@@ -718,6 +718,8 @@ message CanvasSpec {
   // If the list is empty, a default list should be shown.
   // The values should be valid IANA location identifiers.
   repeated string time_zones = 12;
+  // Indicates if filters should be enabled for the canvas.
+  bool filters_enabled = 13;
   // Preset UI state to show by default.
   CanvasPreset default_preset = 15;
   // Variables that can be used in the canvas.
diff --git a/runtime/compilers/rillv1/parse_canvas.go b/runtime/compilers/rillv1/parse_canvas.go
index c92e26f6f13..9f6d5384c1c 100644
--- a/runtime/compilers/rillv1/parse_canvas.go
+++ b/runtime/compilers/rillv1/parse_canvas.go
@@ -23,7 +23,10 @@ type CanvasYAML struct {
 	Theme       yaml.Node              `yaml:"theme"` // Name (string) or inline theme definition (map)
 	TimeRanges  []ExploreTimeRangeYAML `yaml:"time_ranges"`
 	TimeZones   []string               `yaml:"time_zones"`
-	Defaults    *struct {
+	Filters     struct {
+		Enable *bool `yaml:"enable"`
+	}
+	Defaults *struct {
 		TimeRange           string `yaml:"time_range"`
 		ComparisonMode      string `yaml:"comparison_mode"`
 		ComparisonDimension string `yaml:"comparison_dimension"`
@@ -197,6 +200,10 @@ func (p *Parser) parseCanvas(node *Node) error {
 	r.CanvasSpec.Theme = themeName
 	r.CanvasSpec.TimeRanges = timeRanges
 	r.CanvasSpec.TimeZones = tmp.TimeZones
+	r.CanvasSpec.FiltersEnabled = true
+	if tmp.Filters.Enable != nil {
+		r.CanvasSpec.FiltersEnabled = *tmp.Filters.Enable
+	}
 	r.CanvasSpec.DefaultPreset = defaultPreset
 	r.CanvasSpec.EmbeddedTheme = themeSpec
 	r.CanvasSpec.Variables = variables
diff --git a/runtime/compilers/rillv1/parser_test.go b/runtime/compilers/rillv1/parser_test.go
index d57a59f83cf..560e095c323 100644
--- a/runtime/compilers/rillv1/parser_test.go
+++ b/runtime/compilers/rillv1/parser_test.go
@@ -1618,8 +1618,9 @@ theme:
 			Paths: []string{"/canvases/c1.yaml"},
 			Refs:  []ResourceName{{Kind: ResourceKindTheme, Name: "t1"}},
 			CanvasSpec: &runtimev1.CanvasSpec{
-				DisplayName: "C1",
-				Theme:       "t1",
+				DisplayName:    "C1",
+				Theme:          "t1",
+				FiltersEnabled: true,
 			},
 		},
 		{
@@ -1636,6 +1637,7 @@ theme:
 					},
 					PrimaryColorRaw: "red",
 				},
+				FiltersEnabled: true,
 			},
 		},
 	}
@@ -1694,6 +1696,10 @@ time_ranges:
       - P1M
       - offset: P4M
         range: P2M
+
+filters:
+  enable: false
+
 defaults:
   time_range: P4W
 
@@ -1770,6 +1776,7 @@ items:
 						},
 					},
 				},
+				FiltersEnabled: false,
 				DefaultPreset: &runtimev1.CanvasPreset{
 					TimeRange:      asPtr("P4W"),
 					ComparisonMode: runtimev1.ExploreComparisonMode_EXPLORE_COMPARISON_MODE_NONE,
diff --git a/web-common/src/proto/gen/rill/runtime/v1/resources_pb.ts b/web-common/src/proto/gen/rill/runtime/v1/resources_pb.ts
index 298cc557454..77468b2277d 100644
--- a/web-common/src/proto/gen/rill/runtime/v1/resources_pb.ts
+++ b/web-common/src/proto/gen/rill/runtime/v1/resources_pb.ts
@@ -4535,6 +4535,13 @@ export class CanvasSpec extends Message<CanvasSpec> {
    */
   timeZones: string[] = [];
 
+  /**
+   * Indicates if filters should be enabled for the canvas.
+   *
+   * @generated from field: bool filters_enabled = 13;
+   */
+  filtersEnabled = false;
+
   /**
    * Preset UI state to show by default.
    *
@@ -4579,6 +4586,7 @@ export class CanvasSpec extends Message<CanvasSpec> {
     { no: 8, name: "embedded_theme", kind: "message", T: ThemeSpec },
     { no: 11, name: "time_ranges", kind: "message", T: ExploreTimeRange, repeated: true },
     { no: 12, name: "time_zones", kind: "scalar", T: 9 /* ScalarType.STRING */, repeated: true },
+    { no: 13, name: "filters_enabled", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
     { no: 15, name: "default_preset", kind: "message", T: CanvasPreset },
     { no: 5, name: "variables", kind: "message", T: ComponentVariable, repeated: true },
     { no: 4, name: "items", kind: "message", T: CanvasItem, repeated: true },
diff --git a/web-common/src/runtime-client/gen/index.schemas.ts b/web-common/src/runtime-client/gen/index.schemas.ts
index 7f1e68dcbcb..8f5d39376ff 100644
--- a/web-common/src/runtime-client/gen/index.schemas.ts
+++ b/web-common/src/runtime-client/gen/index.schemas.ts
@@ -2369,6 +2369,8 @@ TODO: Once the canvas APIs have stabilized, rename ExploreTimeRange to a non-exp
 If the list is empty, a default list should be shown.
 The values should be valid IANA location identifiers. */
   timeZones?: string[];
+  /** Indicates if filters should be enabled for the canvas. */
+  filtersEnabled?: boolean;
   defaultPreset?: V1CanvasPreset;
   /** Variables that can be used in the canvas. */
   variables?: V1ComponentVariable[];

From f8220063acd6f0dc9d8f166d0a6c6d1955eb4b0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Egelund-M=C3=BCller?= <b@egelund-muller.com>
Date: Thu, 23 Jan 2025 16:44:35 +0000
Subject: [PATCH 03/48] Increase health check concurrency to 32 (#6488)

---
 admin/worker/deployments_health_check.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/worker/deployments_health_check.go b/admin/worker/deployments_health_check.go
index 9ffd33fc1ed..c94e5db82ad 100644
--- a/admin/worker/deployments_health_check.go
+++ b/admin/worker/deployments_health_check.go
@@ -34,7 +34,7 @@ func (w *Worker) deploymentsHealthCheck(ctx context.Context) error {
 		}
 
 		group, cctx := errgroup.WithContext(ctx)
-		group.SetLimit(8)
+		group.SetLimit(32)
 		for _, d := range deployments {
 			d := d
 			if d.Status != database.DeploymentStatusOK {

From 4d751cbea3b02997e65cad42ea5d4839d57e56fd Mon Sep 17 00:00:00 2001
From: Anshul Khandelwal <12948312+k-anshul@users.noreply.github.com>
Date: Fri, 24 Jan 2025 09:41:20 +0530
Subject: [PATCH 04/48] fix : db file does not get deleted if mutate/rename
 gets errored/cancelled mid way (#6494)

* version can leak if mutate errors in between

* also fix create
---
 runtime/pkg/rduckdb/db.go | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/runtime/pkg/rduckdb/db.go b/runtime/pkg/rduckdb/db.go
index 56b79424780..b6b898f125c 100644
--- a/runtime/pkg/rduckdb/db.go
+++ b/runtime/pkg/rduckdb/db.go
@@ -318,7 +318,7 @@ func (d *db) AcquireReadConnection(ctx context.Context) (*sqlx.Conn, func() erro
 	return conn, release, nil
 }
 
-func (d *db) CreateTableAsSelect(ctx context.Context, name, query string, opts *CreateTableOptions) error {
+func (d *db) CreateTableAsSelect(ctx context.Context, name, query string, opts *CreateTableOptions) (createErr error) {
 	d.logger.Debug("create: create table", slog.String("name", name), slog.Bool("view", opts.View))
 	err := d.writeSem.Acquire(ctx, 1)
 	if err != nil {
@@ -359,6 +359,11 @@ func (d *db) CreateTableAsSelect(ctx context.Context, name, query string, opts *
 			return fmt.Errorf("create: unable to create dir %q: %w", name, err)
 		}
 		dsn = d.localDBPath(name, newVersion)
+		defer func() {
+			if createErr != nil {
+				_ = d.deleteLocalTableFiles(name, newVersion)
+			}
+		}()
 	}
 
 	// need to attach existing table so that any views dependent on this table are correctly attached
@@ -453,8 +458,10 @@ func (d *db) MutateTable(ctx context.Context, name string, mutateFn func(ctx con
 
 	// create new version directory
 	newVersion := newVersion()
-	err = copyDir(d.localTableDir(name, newVersion), d.localTableDir(name, oldMeta.Version))
+	newDir := d.localTableDir(name, newVersion)
+	err = copyDir(newDir, d.localTableDir(name, oldMeta.Version))
 	if err != nil {
+		_ = os.RemoveAll(newDir)
 		return fmt.Errorf("mutate: copy table failed: %w", err)
 	}
 
@@ -462,11 +469,13 @@ func (d *db) MutateTable(ctx context.Context, name string, mutateFn func(ctx con
 	// need to ignore attaching table since it is already present in the db file
 	conn, release, err := d.acquireWriteConn(ctx, d.localDBPath(name, newVersion), name, false)
 	if err != nil {
+		_ = os.RemoveAll(newDir)
 		return err
 	}
 
 	err = mutateFn(ctx, conn)
 	if err != nil {
+		_ = os.RemoveAll(newDir)
 		_ = release()
 		return fmt.Errorf("mutate: mutate failed: %w", err)
 	}
@@ -474,6 +483,7 @@ func (d *db) MutateTable(ctx context.Context, name string, mutateFn func(ctx con
 	// push to remote
 	err = release()
 	if err != nil {
+		_ = os.RemoveAll(newDir)
 		return fmt.Errorf("mutate: failed to close connection: %w", err)
 	}
 	meta := &tableMeta{
@@ -485,6 +495,7 @@ func (d *db) MutateTable(ctx context.Context, name string, mutateFn func(ctx con
 	}
 	err = d.pushToRemote(ctx, name, oldMeta, meta)
 	if err != nil {
+		_ = os.RemoveAll(newDir)
 		return fmt.Errorf("mutate: replicate failed: %w", err)
 	}
 	// no errors after this point since background goroutine will eventually sync the local db
@@ -570,15 +581,19 @@ func (d *db) RenameTable(ctx context.Context, oldName, newName string) error {
 
 	// copy the old table to new table
 	newVersion := newVersion()
+	var newDir string
 	if oldMeta.Type == "TABLE" {
+		newDir = d.localTableDir(newName, newVersion)
 		err = copyDir(d.localTableDir(newName, newVersion), d.localTableDir(oldName, oldMeta.Version))
 		if err != nil {
+			_ = os.RemoveAll(newDir)
 			return fmt.Errorf("rename: copy table failed: %w", err)
 		}
 
 		// rename the underlying table
 		err = renameTable(ctx, d.localDBPath(newName, newVersion), oldName, newName)
 		if err != nil {
+			_ = os.RemoveAll(newDir)
 			return fmt.Errorf("rename: rename table failed: %w", err)
 		}
 	} else {
@@ -597,6 +612,9 @@ func (d *db) RenameTable(ctx context.Context, oldName, newName string) error {
 		SQL:            oldMeta.SQL,
 	}
 	if err := d.pushToRemote(ctx, newName, newTableOldMeta, meta); err != nil {
+		if newDir != "" {
+			_ = os.RemoveAll(newDir)
+		}
 		return fmt.Errorf("rename: unable to replicate new table: %w", err)
 	}
 
@@ -607,6 +625,9 @@ func (d *db) RenameTable(ctx context.Context, oldName, newName string) error {
 	// drop the old table in remote
 	err = d.deleteRemote(ctx, oldName, "")
 	if err != nil {
+		if newDir != "" {
+			_ = os.RemoveAll(newDir)
+		}
 		return fmt.Errorf("rename: unable to delete old table %q from remote: %w", oldName, err)
 	}
 

From b9dfa25eeca301767b6d7cff9dbefb71fe5ec770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Egelund-M=C3=BCller?= <b@egelund-muller.com>
Date: Fri, 24 Jan 2025 12:12:23 +0000
Subject: [PATCH 05/48] Increase timeout for graceful controller shutdown to
 30s (#6500)

---
 runtime/controller.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/controller.go b/runtime/controller.go
index 25e45dfac3b..ce5eee44bda 100644
--- a/runtime/controller.go
+++ b/runtime/controller.go
@@ -276,7 +276,7 @@ func (c *Controller) Run(ctx context.Context) error {
 	c.mu.RUnlock()
 
 	// Allow 10 seconds for closing invocations and reconcilers
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancel()
 
 	// Need to consume all the cancelled invocation completions (otherwise, they will hang on sending to c.completed)

From 351e3633695adfe7d96f5b06a8678039c23d2932 Mon Sep 17 00:00:00 2001
From: Aditya Hegde <adityahegderocks@gmail.com>
Date: Mon, 27 Jan 2025 19:48:21 +0530
Subject: [PATCH 06/48] Fix broken project status page when there are same
 messages (#6510)

---
 .../src/features/projects/status/ProjectParseErrors.svelte      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web-admin/src/features/projects/status/ProjectParseErrors.svelte b/web-admin/src/features/projects/status/ProjectParseErrors.svelte
index ff32404d884..5038ae8b031 100644
--- a/web-admin/src/features/projects/status/ProjectParseErrors.svelte
+++ b/web-admin/src/features/projects/status/ProjectParseErrors.svelte
@@ -41,7 +41,7 @@
   {:else if isSuccess}
     {#if parseErrors && parseErrors.length > 0}
       <ul class="border rounded-sm">
-        {#each parseErrors as error (error.message)}
+        {#each parseErrors as error, i (i)}
           <li
             class="flex gap-x-5 justify-between py-1 px-9 border-b border-gray-200 bg-red-50 font-mono last:border-b-0"
           >

From 8bce8ac332bfa1ed6104756df2f3f4dd65491599 Mon Sep 17 00:00:00 2001
From: Janet <30886488+jkhwu@users.noreply.github.com>
Date: Mon, 27 Jan 2025 06:32:30 -0800
Subject: [PATCH 07/48] Update multiple-olap.md (#6024)

Updated the bottom section to refer to metrics views rather than rill.yaml and dashboards
---
 docs/docs/reference/olap-engines/multiple-olap.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/docs/reference/olap-engines/multiple-olap.md b/docs/docs/reference/olap-engines/multiple-olap.md
index 1f2e559bdc0..202e5f16f04 100644
--- a/docs/docs/reference/olap-engines/multiple-olap.md
+++ b/docs/docs/reference/olap-engines/multiple-olap.md
@@ -67,14 +67,14 @@ For more information about available configurations for `rill.yaml`, please see
 
 :::
 
-### Setting the OLAP Engine in the dashboard YAML
+### Setting the OLAP Engine in the metrics view YAML
 
-For each dashboard that is using a separate OLAP engine (than the default), you'll want to set the `connector` and `table` properties in the underlying [dashboard YAML](../project-files/explore-dashboards.md) configuration to the OLAP engine and corresponding [external table](../../concepts/OLAP#external-olap-tables) that exists in your OLAP store respectively.
+For each metrics view that is using a separate OLAP engine (than the default), you'll want to set the `connector` and `table` properties in the underlying [metrics view YAML](../project-files/metrics-view.md) configuration to the OLAP engine and corresponding [external table](../../concepts/OLAP#external-olap-tables) that exists in your OLAP store respectively.
 
 ```yaml
 type: metrics_view
-title: <dashboard_name>
+title: <metrics_view_name>
 connector: <olap_engine>
 table: <external_table_in_olap>
 ...
-```
\ No newline at end of file
+```

From 800a11a5a3eb45f25c35033492561d2e85b836a1 Mon Sep 17 00:00:00 2001
From: Alexander Thor <alec.karlsson@gmail.com>
Date: Mon, 27 Jan 2025 15:33:01 +0100
Subject: [PATCH 08/48] feat: add quick actions for pivot (#6505)

* feat: add quick actions for pivot

* fix: lint

* fix: add tooltips and adjust delay

* fix: column event handler
---
 .../features/dashboards/pivot/DragList.svelte | 106 +++++++++++++++---
 .../dashboards/pivot/PivotChip.svelte         |   7 +-
 2 files changed, 96 insertions(+), 17 deletions(-)

diff --git a/web-common/src/features/dashboards/pivot/DragList.svelte b/web-common/src/features/dashboards/pivot/DragList.svelte
index 2a7e3f1cc81..db57283d19b 100644
--- a/web-common/src/features/dashboards/pivot/DragList.svelte
+++ b/web-common/src/features/dashboards/pivot/DragList.svelte
@@ -7,6 +7,12 @@
   import PivotPortalItem from "./PivotPortalItem.svelte";
   import { swapListener } from "./swapListener";
   import { type PivotChipData, PivotChipType } from "./types";
+  import Column from "@rilldata/web-common/components/icons/Column.svelte";
+  import Row from "@rilldata/web-common/components/icons/Row.svelte";
+  import { getStateManagers } from "../state-managers/state-managers";
+  import { metricsExplorerStore } from "../stores/dashboard-stores";
+  import Tooltip from "@rilldata/web-common/components/tooltip/Tooltip.svelte";
+  import TooltipContent from "@rilldata/web-common/components/tooltip/TooltipContent.svelte";
 
   export type Zone = "rows" | "columns" | "Time" | "Measures" | "Dimensions";
 
@@ -36,6 +42,8 @@
   let offset = { x: 0, y: 0 };
   let dragStart = { left: 0, top: 0 };
 
+  const { exploreName } = getStateManagers();
+
   $: dragData = $dragDataStore;
   $: source = dragData?.source;
   $: dragChip = dragData?.chip;
@@ -147,6 +155,14 @@
     $ghostIndex = null;
     swap = false;
   }
+
+  function handleRowClick(item: PivotChipData) {
+    metricsExplorerStore.addPivotField($exploreName, item, true);
+  }
+
+  function handleColumnClick(item: PivotChipData) {
+    metricsExplorerStore.addPivotField($exploreName, item, false);
+  }
 </script>
 
 <div
@@ -166,24 +182,62 @@
   bind:this={container}
 >
   {#each items as item, index (item.id)}
-    {#if index === $ghostIndex}
-      <span
-        class="ghost"
-        class:rounded={dragChip?.type !== PivotChipType.Measure}
+    <div
+      class="item-wrapper"
+      class:aligned={zone === "Time" ||
+        zone === "Measures" ||
+        zone === "Dimensions"}
+    >
+      {#if index === $ghostIndex}
+        <span
+          class="ghost"
+          class:rounded={dragChip?.type !== PivotChipType.Measure}
+        />
+      {/if}
+
+      <PivotDragItem
+        {item}
+        {index}
+        removable={isDropLocation}
+        hidden={dragChip?.id === item.id && zoneStartedDrag}
+        on:mousedown={(e) => handleMouseDown(e, item)}
+        on:remove={() => {
+          items = items.filter((i) => i.id !== item.id);
+          dispatch("update", items);
+        }}
       />
-    {/if}
 
-    <PivotDragItem
-      {item}
-      {index}
-      removable={isDropLocation}
-      hidden={dragChip?.id === item.id && zoneStartedDrag}
-      on:mousedown={(e) => handleMouseDown(e, item)}
-      on:remove={() => {
-        items = items.filter((i) => i.id !== item.id);
-        dispatch("update", items);
-      }}
-    />
+      <div class="icons">
+        {#if zone === "Time" || zone === "Dimensions"}
+          <Tooltip distance={8} location="top" alignment="start">
+            <button
+              class="icon-wrapper"
+              on:click={() => handleRowClick(item)}
+              aria-label="Add Row"
+              type="button"
+            >
+              <Row size="16px" />
+            </button>
+            <TooltipContent slot="tooltip-content">Add to rows</TooltipContent>
+          </Tooltip>
+        {/if}
+        {#if zone === "Time" || zone === "Measures" || zone === "Dimensions"}
+          <Tooltip distance={8} location="top" alignment="start">
+            <button
+              class="icon-wrapper"
+              on:click={() => handleColumnClick(item)}
+              aria-label="Add Column"
+              type="button"
+            >
+              <Column size="16px" />
+            </button>
+            <TooltipContent slot="tooltip-content"
+              >Add to columns</TooltipContent
+            >
+          </Tooltip>
+        {/if}
+      </div>
+    </div>
   {:else}
     {#if $ghostIndex === null}
       <p>{placeholder}</p>
@@ -251,4 +305,24 @@
   .rounded {
     @apply rounded-full;
   }
+
+  .item-wrapper {
+    @apply flex items-center;
+  }
+
+  .item-wrapper.aligned {
+    @apply justify-between w-full;
+  }
+
+  .icons {
+    @apply flex gap-x-2 opacity-0 transition-opacity duration-200;
+  }
+
+  .item-wrapper:hover .icons {
+    @apply opacity-100;
+  }
+
+  .icon-wrapper {
+    @apply inline-flex items-center justify-center cursor-pointer;
+  }
 </style>
diff --git a/web-common/src/features/dashboards/pivot/PivotChip.svelte b/web-common/src/features/dashboards/pivot/PivotChip.svelte
index 3fd39149aed..2ec22b79c15 100644
--- a/web-common/src/features/dashboards/pivot/PivotChip.svelte
+++ b/web-common/src/features/dashboards/pivot/PivotChip.svelte
@@ -18,7 +18,12 @@
   const dispatch = createEventDispatcher();
 </script>
 
-<Tooltip distance={8} location="right" suppress={!item.description}>
+<Tooltip
+  distance={8}
+  location="right"
+  suppress={!item.description}
+  activeDelay={200}
+>
   <Chip
     type={item.type}
     label={item.title}

From 43cb7416127d979f5a067a4963d000dc1dcb087f Mon Sep 17 00:00:00 2001
From: Brian Holmes <120223836+briangregoryholmes@users.noreply.github.com>
Date: Mon, 27 Jan 2025 09:45:35 -0500
Subject: [PATCH 09/48] fix: embedded dashboards without time series (#6496)

* fix: embedded dashboards without time series

* tweak

* attempt to fix test
---
 .../dashboards/url-state/DashboardURLStateSyncWrapper.svelte  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web-common/src/features/dashboards/url-state/DashboardURLStateSyncWrapper.svelte b/web-common/src/features/dashboards/url-state/DashboardURLStateSyncWrapper.svelte
index e393aef5a71..6b7d375a233 100644
--- a/web-common/src/features/dashboards/url-state/DashboardURLStateSyncWrapper.svelte
+++ b/web-common/src/features/dashboards/url-state/DashboardURLStateSyncWrapper.svelte
@@ -59,9 +59,11 @@
 
   // only reactive to url and defaultExplorePreset
   $: parseUrl($page.url, defaultExplorePreset);
+
+  $: validSpec = $validSpecStore.data;
 </script>
 
-{#if !$validSpecStore.isLoading && !$metricsViewTimeRange.isLoading}
+{#if !$validSpecStore.isLoading && (!validSpec?.metricsView?.timeDimension || !$metricsViewTimeRange.isLoading)}
   <DashboardURLStateSync
     metricsViewName={$metricsViewName}
     exploreName={$exploreName}

From 51887c4ba318607777ed86bd0cc130eb5586a0cc Mon Sep 17 00:00:00 2001
From: Graham Plata <graham.plata@gmail.com>
Date: Mon, 27 Jan 2025 11:59:11 -0500
Subject: [PATCH 10/48] update protos and adjust impl

---
 proto/gen/rill/runtime/v1/api.pb.go           | 1215 +++++++++--------
 proto/gen/rill/runtime/v1/api.pb.validate.go  |    4 +
 .../gen/rill/runtime/v1/runtime.swagger.yaml  |    9 +
 proto/rill/runtime/v1/api.proto               |    3 +
 runtime/server/controller.go                  |   13 +-
 .../src/proto/gen/rill/runtime/v1/api_pb.ts   |   14 +
 .../src/runtime-client/gen/index.schemas.ts   |    2 +
 7 files changed, 656 insertions(+), 604 deletions(-)

diff --git a/proto/gen/rill/runtime/v1/api.pb.go b/proto/gen/rill/runtime/v1/api.pb.go
index ae610a4f438..f2ffc567a8b 100644
--- a/proto/gen/rill/runtime/v1/api.pb.go
+++ b/proto/gen/rill/runtime/v1/api.pb.go
@@ -3579,6 +3579,8 @@ type ListResourcesRequest struct {
 	Kind string `protobuf:"bytes,2,opt,name=kind,proto3" json:"kind,omitempty"`
 	// Filter by resource path (optional).
 	Path string `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"`
+	// Skip security checks
+	SkipChecks bool `protobuf:"varint,4,opt,name=skip_checks,json=skipChecks,proto3" json:"skip_checks,omitempty"`
 }
 
 func (x *ListResourcesRequest) Reset() {
@@ -3634,6 +3636,13 @@ func (x *ListResourcesRequest) GetPath() string {
 	return ""
 }
 
+func (x *ListResourcesRequest) GetSkipChecks() bool {
+	if x != nil {
+		return x.SkipChecks
+	}
+	return false
+}
+
 type ListResourcesResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3822,6 +3831,7 @@ type GetResourceRequest struct {
 
 	InstanceId string        `protobuf:"bytes,1,opt,name=instance_id,json=instanceId,proto3" json:"instance_id,omitempty"`
 	Name       *ResourceName `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	SkipChecks bool          `protobuf:"varint,3,opt,name=skip_checks,json=skipChecks,proto3" json:"skip_checks,omitempty"`
 }
 
 func (x *GetResourceRequest) Reset() {
@@ -3870,6 +3880,13 @@ func (x *GetResourceRequest) GetName() *ResourceName {
 	return nil
 }
 
+func (x *GetResourceRequest) GetSkipChecks() bool {
+	if x != nil {
+		return x.SkipChecks
+	}
+	return false
+}
+
 type GetResourceResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5878,633 +5895,637 @@ var file_rill_runtime_v1_api_proto_rawDesc = []byte{
 	0x63, 0x68, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x26,
 	0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x72, 0x69,
 	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x6f,
-	0x67, 0x52, 0x03, 0x6c, 0x6f, 0x67, 0x22, 0x5f, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f,
+	0x67, 0x52, 0x03, 0x6c, 0x6f, 0x67, 0x22, 0x80, 0x01, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x52,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64,
+	0x12, 0x12, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x6b, 0x69, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x6b, 0x69, 0x70,
+	0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73,
+	0x6b, 0x69, 0x70, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x22, 0x50, 0x0a, 0x15, 0x4c, 0x69, 0x73,
+	0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x37, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0x7a, 0x0a, 0x15, 0x57,
+	0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61,
+	0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x70,
+	0x6c, 0x61, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6c, 0x61,
+	0x79, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0xb8, 0x01, 0x0a, 0x16, 0x57, 0x61, 0x74, 0x63,
+	0x68, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x34, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0e, 0x32, 0x1e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x45, 0x76, 0x65, 0x6e,
+	0x74, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x31, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x35, 0x0a, 0x08, 0x72,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e,
+	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
+	0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x22, 0x89, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73,
+	0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
+	0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a,
+	0x0b, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x0a, 0x73, 0x6b, 0x69, 0x70, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x22, 0x4c,
+	0x0a, 0x13, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x35, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x48, 0x0a, 0x11,
+	0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x87, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x45, 0x78,
+	0x70, 0x6c, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x33, 0x0a,
+	0x07, 0x65, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19,
+	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
+	0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x07, 0x65, 0x78, 0x70, 0x6c, 0x6f,
+	0x72, 0x65, 0x12, 0x3c, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x76, 0x69,
+	0x65, 0x77, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x56, 0x69, 0x65, 0x77,
+	0x22, 0xce, 0x01, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61, 0x72,
+	0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f,
 	0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12,
-	0x12, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6b,
-	0x69, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x22, 0x50, 0x0a, 0x15, 0x4c, 0x69, 0x73, 0x74, 0x52,
-	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x37, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x09,
-	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0x7a, 0x0a, 0x15, 0x57, 0x61, 0x74,
-	0x63, 0x68, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x70, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x12,
+	0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x07, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x65, 0x64, 0x12, 0x27, 0x0a, 0x09, 0x70, 0x61, 0x67,
+	0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x0a, 0xfa, 0x42,
+	0x07, 0x2a, 0x05, 0x18, 0x90, 0x4e, 0x40, 0x01, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69,
+	0x7a, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65,
+	0x6e, 0x22, 0x85, 0x01, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61,
+	0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x3f, 0x0a, 0x0a, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
+	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61, 0x72, 0x74,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x12, 0x26, 0x0a, 0x0f, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74,
+	0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6e, 0x65, 0x78, 0x74,
+	0x50, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0xaf, 0x02, 0x0a, 0x14, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65,
 	0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69,
 	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6c, 0x61,
-	0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x12,
-	0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
-	0x6c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0xb8, 0x01, 0x0a, 0x16, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52,
-	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x34, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x1e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
-	0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52,
-	0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x31, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4e,
-	0x61, 0x6d, 0x65, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x35, 0x0a, 0x08, 0x72, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x69,
-	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x22, 0x68, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x4e, 0x61, 0x6d, 0x65, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x4c, 0x0a, 0x13, 0x47, 0x65,
-	0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x35, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x08,
-	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x48, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x45,
-	0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a,
-	0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x12,
-	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x22, 0x87, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72,
-	0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x33, 0x0a, 0x07, 0x65, 0x78, 0x70,
-	0x6c, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x69, 0x6c,
+	0x65, 0x49, 0x64, 0x12, 0x3b, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
+	0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
+	0x12, 0x3c, 0x0a, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+	0x76, 0x31, 0x2e, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x54,
+	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x12, 0x16,
+	0x0a, 0x06, 0x70, 0x61, 0x72, 0x73, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
+	0x70, 0x61, 0x72, 0x73, 0x65, 0x72, 0x12, 0x2c, 0x0a, 0x12, 0x61, 0x6c, 0x6c, 0x5f, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x73, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x10, 0x61, 0x6c, 0x6c, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x4d, 0x6f,
+	0x64, 0x65, 0x6c, 0x73, 0x12, 0x35, 0x0a, 0x17, 0x61, 0x6c, 0x6c, 0x5f, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x73, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x5f, 0x66, 0x75, 0x6c, 0x6c, 0x18,
+	0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x61, 0x6c, 0x6c, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x73, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x46, 0x75, 0x6c, 0x6c, 0x22, 0x17, 0x0a, 0x15, 0x43,
+	0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0xfb, 0x09, 0x0a, 0x0f, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x56, 0x0a, 0x11,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65,
+	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
+	0x74, 0x79, 0x52, 0x10, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
+	0x74, 0x69, 0x65, 0x73, 0x12, 0x56, 0x0a, 0x11, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x70,
+	0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
+	0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65,
+	0x72, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x52, 0x10, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, 0x21, 0x0a, 0x0c,
+	0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12,
+	0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x12, 0x2f, 0x0a, 0x13, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f,
+	0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12,
+	0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74,
+	0x72, 0x79, 0x12, 0x2d, 0x0a, 0x12, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73,
+	0x5f, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11,
+	0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f,
+	0x67, 0x12, 0x27, 0x0a, 0x0f, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f,
+	0x72, 0x65, 0x70, 0x6f, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x69, 0x6d, 0x70, 0x6c,
+	0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x70, 0x6f, 0x12, 0x29, 0x0a, 0x10, 0x69, 0x6d,
+	0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, 0x0d,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73,
+	0x41, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65,
+	0x6e, 0x74, 0x73, 0x5f, 0x61, 0x69, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x6d,
+	0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x41, 0x69, 0x12, 0x30, 0x0a, 0x14, 0x69, 0x6d,
+	0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x73, 0x71, 0x6c, 0x5f, 0x73, 0x74, 0x6f,
+	0x72, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d,
+	0x65, 0x6e, 0x74, 0x73, 0x53, 0x71, 0x6c, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x12, 0x27, 0x0a, 0x0f,
+	0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x6f, 0x6c, 0x61, 0x70, 0x18,
+	0x10, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74,
+	0x73, 0x4f, 0x6c, 0x61, 0x70, 0x12, 0x36, 0x0a, 0x17, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65,
+	0x6e, 0x74, 0x73, 0x5f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65,
+	0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e,
+	0x74, 0x73, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x12, 0x32, 0x0a,
+	0x15, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x66, 0x69, 0x6c, 0x65,
+	0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x69, 0x6d,
+	0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x46, 0x69, 0x6c, 0x65, 0x53, 0x74, 0x6f, 0x72,
+	0x65, 0x12, 0x2f, 0x0a, 0x13, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f,
+	0x6e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x13, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12,
+	0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69,
+	0x65, 0x72, 0x12, 0x31, 0x0a, 0x14, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73,
+	0x5f, 0x77, 0x61, 0x72, 0x65, 0x68, 0x6f, 0x75, 0x73, 0x65, 0x18, 0x14, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x13, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x57, 0x61, 0x72, 0x65,
+	0x68, 0x6f, 0x75, 0x73, 0x65, 0x1a, 0xda, 0x03, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
+	0x74, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x6b, 0x65, 0x79, 0x12, 0x42, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0e, 0x32, 0x2e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72,
+	0x69, 0x76, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x54, 0x79,
+	0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x71, 0x75,
+	0x69, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x72, 0x65, 0x71, 0x75,
+	0x69, 0x72, 0x65, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x5f,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70,
+	0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72,
+	0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65,
+	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x08, 0x64, 0x6f, 0x63,
+	0x73, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64, 0x6f, 0x63,
+	0x73, 0x55, 0x72, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x69, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x68, 0x69, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x66, 0x61,
+	0x75, 0x6c, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75,
+	0x6c, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65,
+	0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f,
+	0x6c, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x0a,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12, 0x1b, 0x0a, 0x09,
+	0x6e, 0x6f, 0x5f, 0x70, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x08, 0x6e, 0x6f, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x22, 0x77, 0x0a, 0x04, 0x54, 0x79, 0x70,
+	0x65, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43,
+	0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f,
+	0x4e, 0x55, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45,
+	0x5f, 0x42, 0x4f, 0x4f, 0x4c, 0x45, 0x41, 0x4e, 0x10, 0x02, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59,
+	0x50, 0x45, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x54,
+	0x59, 0x50, 0x45, 0x5f, 0x46, 0x49, 0x4c, 0x45, 0x10, 0x04, 0x12, 0x16, 0x0a, 0x12, 0x54, 0x59,
+	0x50, 0x45, 0x5f, 0x49, 0x4e, 0x46, 0x4f, 0x52, 0x4d, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x41, 0x4c,
+	0x10, 0x05, 0x22, 0x9d, 0x07, 0x0a, 0x11, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x43,
+	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x38, 0x0a, 0x06,
+	0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x72,
+	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43,
+	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x06,
+	0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x12, 0x46, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65,
+	0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x59,
+	0x0a, 0x0d, 0x70, 0x72, 0x65, 0x73, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
+	0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64,
+	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x50, 0x72, 0x65, 0x73, 0x65, 0x74,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x70, 0x72, 0x65,
+	0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5c, 0x0a, 0x0e, 0x70, 0x72, 0x6f,
+	0x6a, 0x65, 0x63, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x05, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x35, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63,
+	0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x50, 0x0a, 0x0a, 0x65, 0x6e, 0x76, 0x5f, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x72, 0x69,
+	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e,
+	0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e,
+	0x45, 0x6e, 0x76, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09,
+	0x65, 0x6e, 0x76, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x6f,
+	0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x70, 0x72,
+	0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x3e, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x76, 0x69,
+	0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x72, 0x67, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73,
+	0x69, 0x6f, 0x6e, 0x41, 0x72, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x14, 0x68, 0x61, 0x73, 0x5f, 0x61,
+	0x6e, 0x6f, 0x6e, 0x79, 0x6d, 0x6f, 0x75, 0x73, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18,
+	0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x68, 0x61, 0x73, 0x41, 0x6e, 0x6f, 0x6e, 0x79, 0x6d,
+	0x6f, 0x75, 0x73, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x36, 0x0a, 0x07, 0x75, 0x73, 0x65,
+	0x64, 0x5f, 0x62, 0x79, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c,
 	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x07, 0x65, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x12, 0x3c,
-	0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x76, 0x69, 0x65, 0x77, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52,
-	0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x56, 0x69, 0x65, 0x77, 0x22, 0xce, 0x01, 0x0a,
-	0x19, 0x47, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e,
-	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d,
-	0x6f, 0x64, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x64, 0x65,
-	0x6c, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x07, 0x70, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x65,
-	0x72, 0x72, 0x6f, 0x72, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x65, 0x72,
-	0x72, 0x6f, 0x72, 0x65, 0x64, 0x12, 0x27, 0x0a, 0x09, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x69,
-	0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x0a, 0xfa, 0x42, 0x07, 0x2a, 0x05, 0x18,
-	0x90, 0x4e, 0x40, 0x01, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x1d,
-	0x0a, 0x0a, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0x85, 0x01,
-	0x0a, 0x1a, 0x47, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x0a,
-	0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
-	0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x0a, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x26, 0x0a,
-	0x0f, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6e, 0x65, 0x78, 0x74, 0x50, 0x61, 0x67, 0x65,
-	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0xaf, 0x02, 0x0a, 0x14, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
-	0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f,
-	0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12,
-	0x3b, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x06, 0x75, 0x73, 0x65, 0x64, 0x42,
+	0x79, 0x12, 0x23, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x4d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	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, 0x1a, 0x3f, 0x0a, 0x11, 0x50, 0x72, 0x65, 0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 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, 0x1a, 0x40, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 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, 0x1a, 0x3c, 0x0a, 0x0e, 0x45, 0x6e, 0x76, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 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, 0x1d, 0x0a, 0x1b, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x22, 0x60, 0x0a, 0x1c, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x40, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f,
+	0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x73, 0x22, 0x3b, 0x0a, 0x18, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x43, 0x6f,
+	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64,
+	0x22, 0x5f, 0x0a, 0x19, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x42, 0x0a,
+	0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
+	0x73, 0x22, 0x40, 0x0a, 0x1d, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65,
+	0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
+	0x65, 0x49, 0x64, 0x22, 0x5c, 0x0a, 0x1e, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66,
+	0x69, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3a, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
+	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
+	0x73, 0x22, 0x7e, 0x0a, 0x12, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x05, 0x65, 0x6d,
+	0x61, 0x69, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x03, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x61,
+	0x64, 0x6d, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x61, 0x64, 0x6d, 0x69,
+	0x6e, 0x22, 0x27, 0x0a, 0x13, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6a, 0x77, 0x74, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6a, 0x77, 0x74, 0x22, 0x3a, 0x0a, 0x17, 0x41, 0x6e,
+	0x61, 0x6c, 0x79, 0x7a, 0x65, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
+	0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x22, 0x5b, 0x0a, 0x18, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a,
+	0x65, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x3f, 0x0a, 0x09, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64,
+	0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x09, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62,
+	0x6c, 0x65, 0x73, 0x22, 0x83, 0x01, 0x0a, 0x10, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64,
+	0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x23, 0x0a, 0x0d,
+	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x12, 0x36, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x08, 0x20, 0x03,
 	0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
 	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4e, 0x61, 0x6d,
-	0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x3c, 0x0a, 0x06,
-	0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x72,
-	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52,
-	0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x54, 0x72, 0x69, 0x67, 0x67,
-	0x65, 0x72, 0x52, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61,
-	0x72, 0x73, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x70, 0x61, 0x72, 0x73,
-	0x65, 0x72, 0x12, 0x2c, 0x0a, 0x12, 0x61, 0x6c, 0x6c, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x73, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10,
-	0x61, 0x6c, 0x6c, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x73,
-	0x12, 0x35, 0x0a, 0x17, 0x61, 0x6c, 0x6c, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x5f,
-	0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x5f, 0x66, 0x75, 0x6c, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x14, 0x61, 0x6c, 0x6c, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x4d, 0x6f, 0x64,
-	0x65, 0x6c, 0x73, 0x46, 0x75, 0x6c, 0x6c, 0x22, 0x17, 0x0a, 0x15, 0x43, 0x72, 0x65, 0x61, 0x74,
-	0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0xfb, 0x09, 0x0a, 0x0f, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72,
-	0x69, 0x76, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x56, 0x0a, 0x11, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44,
-	0x72, 0x69, 0x76, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x52, 0x10,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73,
-	0x12, 0x56, 0x0a, 0x11, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65,
-	0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x72, 0x69,
-	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x2e, 0x50, 0x72,
-	0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x52, 0x10, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x50, 0x72,
-	0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x70,
-	0x6c, 0x61, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
-	0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64,
-	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2f, 0x0a,
-	0x13, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x72, 0x65, 0x67, 0x69,
-	0x73, 0x74, 0x72, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x69, 0x6d, 0x70, 0x6c,
-	0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x12, 0x2d,
-	0x0a, 0x12, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x63, 0x61, 0x74,
-	0x61, 0x6c, 0x6f, 0x67, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x69, 0x6d, 0x70, 0x6c,
-	0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x12, 0x27, 0x0a,
-	0x0f, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x72, 0x65, 0x70, 0x6f,
-	0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e,
-	0x74, 0x73, 0x52, 0x65, 0x70, 0x6f, 0x12, 0x29, 0x0a, 0x10, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d,
-	0x65, 0x6e, 0x74, 0x73, 0x5f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x0f, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x41, 0x64, 0x6d, 0x69,
-	0x6e, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f,
-	0x61, 0x69, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d,
-	0x65, 0x6e, 0x74, 0x73, 0x41, 0x69, 0x12, 0x30, 0x0a, 0x14, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d,
-	0x65, 0x6e, 0x74, 0x73, 0x5f, 0x73, 0x71, 0x6c, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x18, 0x0f,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73,
-	0x53, 0x71, 0x6c, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x69, 0x6d, 0x70, 0x6c,
-	0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x6f, 0x6c, 0x61, 0x70, 0x18, 0x10, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x0e, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x4f, 0x6c, 0x61,
-	0x70, 0x12, 0x36, 0x0a, 0x17, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f,
-	0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x18, 0x11, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x15, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x4f, 0x62,
-	0x6a, 0x65, 0x63, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x12, 0x32, 0x0a, 0x15, 0x69, 0x6d, 0x70,
-	0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x73, 0x74, 0x6f,
-	0x72, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d,
-	0x65, 0x6e, 0x74, 0x73, 0x46, 0x69, 0x6c, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x12, 0x2f, 0x0a,
-	0x13, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x6e, 0x6f, 0x74, 0x69,
-	0x66, 0x69, 0x65, 0x72, 0x18, 0x13, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x69, 0x6d, 0x70, 0x6c,
-	0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x31,
-	0x0a, 0x14, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x77, 0x61, 0x72,
-	0x65, 0x68, 0x6f, 0x75, 0x73, 0x65, 0x18, 0x14, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x69, 0x6d,
-	0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x57, 0x61, 0x72, 0x65, 0x68, 0x6f, 0x75, 0x73,
-	0x65, 0x1a, 0xda, 0x03, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x10,
-	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
-	0x12, 0x42, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e,
-	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
-	0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72,
-	0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04,
-	0x74, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64,
-	0x12, 0x21, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e,
-	0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x08, 0x64, 0x6f, 0x63, 0x73, 0x5f, 0x75, 0x72,
-	0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64, 0x6f, 0x63, 0x73, 0x55, 0x72, 0x6c,
-	0x12, 0x12, 0x0a, 0x04, 0x68, 0x69, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x68, 0x69, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x18,
-	0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x20,
-	0x0a, 0x0b, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x18, 0x09, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72,
-	0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x06, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x6f, 0x5f, 0x70,
-	0x72, 0x6f, 0x6d, 0x70, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x6e, 0x6f, 0x50,
-	0x72, 0x6f, 0x6d, 0x70, 0x74, 0x22, 0x77, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a,
-	0x10, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45,
-	0x44, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4e, 0x55, 0x4d, 0x42,
-	0x45, 0x52, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x42, 0x4f, 0x4f,
-	0x4c, 0x45, 0x41, 0x4e, 0x10, 0x02, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53,
-	0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x54, 0x59, 0x50, 0x45, 0x5f,
-	0x46, 0x49, 0x4c, 0x45, 0x10, 0x04, 0x12, 0x16, 0x0a, 0x12, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49,
-	0x4e, 0x46, 0x4f, 0x52, 0x4d, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x41, 0x4c, 0x10, 0x05, 0x22, 0x9d,
-	0x07, 0x0a, 0x11, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x6f, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x38, 0x0a, 0x06, 0x64, 0x72, 0x69, 0x76,
-	0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
-	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x06, 0x64, 0x72, 0x69, 0x76,
-	0x65, 0x72, 0x12, 0x46, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
-	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x43, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x59, 0x0a, 0x0d, 0x70, 0x72,
-	0x65, 0x73, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x04, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x34, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x50, 0x72, 0x65, 0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x70, 0x72, 0x65, 0x73, 0x65, 0x74, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5c, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74,
-	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e,
-	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
-	0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0x2e, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x12, 0x50, 0x0a, 0x0a, 0x65, 0x6e, 0x76, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a,
-	0x65, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x45, 0x6e, 0x76, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x65, 0x6e, 0x76, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69,
-	0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73,
-	0x69, 0x6f, 0x6e, 0x12, 0x3e, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e,
-	0x5f, 0x61, 0x72, 0x67, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74,
-	0x72, 0x75, 0x63, 0x74, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x41,
-	0x72, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x14, 0x68, 0x61, 0x73, 0x5f, 0x61, 0x6e, 0x6f, 0x6e, 0x79,
-	0x6d, 0x6f, 0x75, 0x73, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x12, 0x68, 0x61, 0x73, 0x41, 0x6e, 0x6f, 0x6e, 0x79, 0x6d, 0x6f, 0x75, 0x73, 0x41,
-	0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x36, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x64, 0x5f, 0x62, 0x79,
-	0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x06, 0x75, 0x73, 0x65, 0x64, 0x42, 0x79, 0x12, 0x23, 0x0a,
-	0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x09,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 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, 0x1a, 0x3f, 0x0a,
-	0x11, 0x50, 0x72, 0x65, 0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 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, 0x1a, 0x40,
-	0x0a, 0x12, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 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,
-	0x1a, 0x3c, 0x0a, 0x0e, 0x45, 0x6e, 0x76, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 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, 0x1d,
-	0x0a, 0x1b, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44,
-	0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x60, 0x0a,
-	0x1c, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72,
-	0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x40, 0x0a,
-	0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x20, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69,
-	0x76, 0x65, 0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x22,
-	0x3b, 0x0a, 0x18, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69,
-	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x22, 0x5f, 0x0a, 0x19,
-	0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
-	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x42, 0x0a, 0x0a, 0x63, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e,
+	0x65, 0x52, 0x06, 0x75, 0x73, 0x65, 0x64, 0x42, 0x79, 0x2a, 0x54, 0x0a, 0x09, 0x46, 0x69, 0x6c,
+	0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x16, 0x46, 0x49, 0x4c, 0x45, 0x5f, 0x45,
+	0x56, 0x45, 0x4e, 0x54, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44,
+	0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x46, 0x49, 0x4c, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54,
+	0x5f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11, 0x46, 0x49, 0x4c, 0x45,
+	0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x02, 0x2a,
+	0x8c, 0x01, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x19, 0x0a, 0x15,
+	0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43,
+	0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x4c, 0x4f, 0x47, 0x5f, 0x4c,
+	0x45, 0x56, 0x45, 0x4c, 0x5f, 0x44, 0x45, 0x42, 0x55, 0x47, 0x10, 0x04, 0x12, 0x12, 0x0a, 0x0e,
+	0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0x08,
+	0x12, 0x12, 0x0a, 0x0e, 0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x57, 0x41,
+	0x52, 0x4e, 0x10, 0x0c, 0x12, 0x13, 0x0a, 0x0f, 0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45,
+	0x4c, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x10, 0x12, 0x13, 0x0a, 0x0f, 0x4c, 0x4f, 0x47,
+	0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x46, 0x41, 0x54, 0x41, 0x4c, 0x10, 0x14, 0x2a, 0x64,
+	0x0a, 0x0d, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12,
+	0x1e, 0x0a, 0x1a, 0x52, 0x45, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e,
+	0x54, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12,
+	0x18, 0x0a, 0x14, 0x52, 0x45, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e,
+	0x54, 0x5f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x10, 0x01, 0x12, 0x19, 0x0a, 0x15, 0x52, 0x45, 0x53,
+	0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x44, 0x45, 0x4c, 0x45,
+	0x54, 0x45, 0x10, 0x02, 0x32, 0xcd, 0x25, 0x0a, 0x0e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x55, 0x0a, 0x04, 0x50, 0x69, 0x6e, 0x67, 0x12,
+	0x1c, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
+	0x31, 0x2e, 0x50, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e,
 	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
-	0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x22, 0x40, 0x0a,
-	0x1d, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x43, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f,
-	0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x22,
-	0x5c, 0x0a, 0x1e, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x43,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x3a, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x22, 0x7e, 0x0a,
-	0x12, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x12, 0x1d, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42,
-	0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x12,
-	0x16, 0x0a, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x22, 0x27, 0x0a,
-	0x13, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6a, 0x77, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x6a, 0x77, 0x74, 0x22, 0x3a, 0x0a, 0x17, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a,
-	0x65, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x49, 0x64, 0x22, 0x5b, 0x0a, 0x18, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x56, 0x61, 0x72,
-	0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f,
-	0x0a, 0x09, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x21, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x56, 0x61, 0x72, 0x69,
-	0x61, 0x62, 0x6c, 0x65, 0x52, 0x09, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x22,
-	0x83, 0x01, 0x0a, 0x10, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x56, 0x61, 0x72, 0x69,
-	0x61, 0x62, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61,
-	0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x36, 0x0a,
-	0x07, 0x75, 0x73, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d,
+	0x50, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x10, 0x82, 0xd3,
+	0xe4, 0x93, 0x02, 0x0a, 0x12, 0x08, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x5d,
+	0x0a, 0x06, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, 0x1e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74,
+	0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74,
+	0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x12, 0x82, 0xd3, 0xe4, 0x93, 0x02,
+	0x0c, 0x12, 0x0a, 0x2f, 0x76, 0x31, 0x2f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, 0x8d, 0x01,
+	0x0a, 0x0e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68,
+	0x12, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+	0x76, 0x31, 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74,
+	0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x61,
+	0x6e, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x2a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x12, 0x22, 0x2f, 0x76, 0x31, 0x2f, 0x68,
+	0x65, 0x61, 0x6c, 0x74, 0x68, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f,
+	0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x12, 0x75, 0x0a,
+	0x0d, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x25,
 	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
-	0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x06, 0x75,
-	0x73, 0x65, 0x64, 0x42, 0x79, 0x2a, 0x54, 0x0a, 0x09, 0x46, 0x69, 0x6c, 0x65, 0x45, 0x76, 0x65,
-	0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x16, 0x46, 0x49, 0x4c, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54,
-	0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x14,
-	0x0a, 0x10, 0x46, 0x49, 0x4c, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x57, 0x52, 0x49,
-	0x54, 0x45, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11, 0x46, 0x49, 0x4c, 0x45, 0x5f, 0x45, 0x56, 0x45,
-	0x4e, 0x54, 0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x02, 0x2a, 0x8c, 0x01, 0x0a, 0x08,
-	0x4c, 0x6f, 0x67, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x19, 0x0a, 0x15, 0x4c, 0x4f, 0x47, 0x5f,
-	0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45,
-	0x44, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c,
-	0x5f, 0x44, 0x45, 0x42, 0x55, 0x47, 0x10, 0x04, 0x12, 0x12, 0x0a, 0x0e, 0x4c, 0x4f, 0x47, 0x5f,
-	0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0x08, 0x12, 0x12, 0x0a, 0x0e,
-	0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x57, 0x41, 0x52, 0x4e, 0x10, 0x0c,
-	0x12, 0x13, 0x0a, 0x0f, 0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x45, 0x52,
-	0x52, 0x4f, 0x52, 0x10, 0x10, 0x12, 0x13, 0x0a, 0x0f, 0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56,
-	0x45, 0x4c, 0x5f, 0x46, 0x41, 0x54, 0x41, 0x4c, 0x10, 0x14, 0x2a, 0x64, 0x0a, 0x0d, 0x52, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x1a, 0x52,
-	0x45, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x55, 0x4e,
-	0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x14, 0x52,
-	0x45, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x57, 0x52,
-	0x49, 0x54, 0x45, 0x10, 0x01, 0x12, 0x19, 0x0a, 0x15, 0x52, 0x45, 0x53, 0x4f, 0x55, 0x52, 0x43,
-	0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x02,
-	0x32, 0xcd, 0x25, 0x0a, 0x0e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x12, 0x55, 0x0a, 0x04, 0x50, 0x69, 0x6e, 0x67, 0x12, 0x1c, 0x2e, 0x72, 0x69,
-	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x69,
-	0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
-	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x69, 0x6e, 0x67,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x10, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0a,
-	0x12, 0x08, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x5d, 0x0a, 0x06, 0x48, 0x65,
-	0x61, 0x6c, 0x74, 0x68, 0x12, 0x1e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x12, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0c, 0x12, 0x0a, 0x2f,
-	0x76, 0x31, 0x2f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, 0x8d, 0x01, 0x0a, 0x0e, 0x49, 0x6e,
-	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, 0x26, 0x2e, 0x72,
-	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x49,
-	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x48,
-	0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2a, 0x82,
-	0xd3, 0xe4, 0x93, 0x02, 0x24, 0x12, 0x22, 0x2f, 0x76, 0x31, 0x2f, 0x68, 0x65, 0x61, 0x6c, 0x74,
-	0x68, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x12, 0x75, 0x0a, 0x0d, 0x4c, 0x69, 0x73,
-	0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x25, 0x2e, 0x72, 0x69, 0x6c,
-	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73,
-	0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x15, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x0f, 0x12, 0x0d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73,
-	0x12, 0x7d, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12,
-	0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
-	0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93,
-	0x02, 0x1d, 0x12, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x12,
-	0x7b, 0x0a, 0x0e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x12, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
-	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61,
-	0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x18, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12, 0x3a, 0x01, 0x2a, 0x22, 0x0d, 0x2f,
-	0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x83, 0x01, 0x0a,
-	0x0c, 0x45, 0x64, 0x69, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x24, 0x2e,
-	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
-	0x45, 0x64, 0x69, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0x82, 0xd3, 0xe4, 0x93,
-	0x02, 0x20, 0x3a, 0x01, 0x2a, 0x32, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69,
-	0x64, 0x7d, 0x12, 0x89, 0x01, 0x0a, 0x0e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e, 0x73,
+	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x15, 0x82,
+	0xd3, 0xe4, 0x93, 0x02, 0x0f, 0x12, 0x0d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61,
+	0x6e, 0x63, 0x65, 0x73, 0x12, 0x7d, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61,
+	0x6e, 0x63, 0x65, 0x12, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
+	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e,
+	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x23,
+	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x12, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f,
+	0x69, 0x64, 0x7d, 0x12, 0x7b, 0x0a, 0x0e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x73,
 	0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e,
 	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e,
 	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
-	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x20, 0x3a, 0x01,
-	0x2a, 0x22, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73,
-	0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x12, 0x7d,
-	0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x12, 0x21, 0x2e, 0x72, 0x69,
-	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69,
-	0x73, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22,
-	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
-	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x12, 0x21, 0x2f, 0x76, 0x31, 0x2f,
-	0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x12, 0x88, 0x01,
-	0x0a, 0x0a, 0x57, 0x61, 0x74, 0x63, 0x68, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x12, 0x22, 0x2e, 0x72,
-	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57,
-	0x61, 0x74, 0x63, 0x68, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
-	0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x12, 0x27, 0x2f,
-	0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e,
-	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73,
-	0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x30, 0x01, 0x12, 0x7d, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x46,
-	0x69, 0x6c, 0x65, 0x12, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x12, 0x27,
+	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x18, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12, 0x3a, 0x01,
+	0x2a, 0x22, 0x0d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73,
+	0x12, 0x83, 0x01, 0x0a, 0x0c, 0x45, 0x64, 0x69, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
+	0x65, 0x12, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x2e, 0x76, 0x31, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x49, 0x6e,
+	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26,
+	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x20, 0x3a, 0x01, 0x2a, 0x32, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x69,
+	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
+	0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x12, 0x89, 0x01, 0x0a, 0x0e, 0x44, 0x65, 0x6c, 0x65, 0x74,
+	0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
+	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65,
+	0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e,
+	0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0x82, 0xd3, 0xe4, 0x93,
+	0x02, 0x20, 0x3a, 0x01, 0x2a, 0x22, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61,
+	0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69,
+	0x64, 0x7d, 0x12, 0x7d, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x12,
+	0x21, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
+	0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x12, 0x21,
 	0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69,
 	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65,
-	0x73, 0x2f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x80, 0x01, 0x0a, 0x07, 0x50, 0x75, 0x74, 0x46,
-	0x69, 0x6c, 0x65, 0x12, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x75, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x75, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x32, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2c, 0x3a, 0x01,
-	0x2a, 0x22, 0x27, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73,
+	0x73, 0x12, 0x88, 0x01, 0x0a, 0x0a, 0x57, 0x61, 0x74, 0x63, 0x68, 0x46, 0x69, 0x6c, 0x65, 0x73,
+	0x12, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+	0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
+	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x46, 0x69, 0x6c, 0x65,
+	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02,
+	0x29, 0x12, 0x27, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73,
 	0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66,
-	0x69, 0x6c, 0x65, 0x73, 0x2f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x96, 0x01, 0x0a, 0x0f, 0x43,
-	0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x27,
-	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
-	0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
-	0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x30, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2a, 0x3a, 0x01, 0x2a, 0x22, 0x25, 0x2f, 0x76,
-	0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f,
-	0x64, 0x69, 0x72, 0x12, 0x86, 0x01, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x46, 0x69,
-	0x6c, 0x65, 0x12, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
-	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
+	0x69, 0x6c, 0x65, 0x73, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x30, 0x01, 0x12, 0x7d, 0x0a, 0x07,
+	0x47, 0x65, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x46, 0x69, 0x6c,
+	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x46, 0x69,
+	0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93,
+	0x02, 0x29, 0x12, 0x27, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f,
+	0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x80, 0x01, 0x0a, 0x07,
+	0x50, 0x75, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x75, 0x74, 0x46, 0x69, 0x6c,
+	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x75, 0x74, 0x46, 0x69,
+	0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x32, 0x82, 0xd3, 0xe4, 0x93,
+	0x02, 0x2c, 0x3a, 0x01, 0x2a, 0x22, 0x27, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61,
+	0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69,
+	0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x96,
+	0x01, 0x0a, 0x0f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f,
+	0x72, 0x79, 0x12, 0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x72, 0x65, 0x63,
+	0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x72, 0x69,
+	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x30, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2a, 0x3a, 0x01, 0x2a,
+	0x22, 0x25, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f,
+	0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69,
+	0x6c, 0x65, 0x73, 0x2f, 0x64, 0x69, 0x72, 0x12, 0x86, 0x01, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65,
+	0x74, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
 	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x46,
-	0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4,
-	0x93, 0x02, 0x29, 0x2a, 0x27, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
+	0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x72, 0x69, 0x6c,
+	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c,
+	0x65, 0x74, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x2a, 0x27, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73,
+	0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x65, 0x6e, 0x74, 0x72, 0x79,
+	0x12, 0x8a, 0x01, 0x0a, 0x0a, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x12,
+	0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
+	0x31, 0x2e, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x46, 0x69, 0x6c, 0x65,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x33, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2d,
+	0x3a, 0x01, 0x2a, 0x22, 0x28, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
 	0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d,
-	0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x8a, 0x01, 0x0a,
-	0x0a, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x22, 0x2e, 0x72, 0x69,
-	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65,
-	0x6e, 0x61, 0x6d, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
-	0x31, 0x2e, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x33, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2d, 0x3a, 0x01, 0x2a, 0x22,
-	0x28, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b,
-	0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c,
-	0x65, 0x73, 0x2f, 0x72, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x71, 0x0a, 0x0c, 0x4c, 0x69, 0x73,
-	0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x12, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
-	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74,
-	0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
-	0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x14, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0e, 0x12, 0x0c,
-	0x2f, 0x76, 0x31, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x12, 0x9b, 0x01, 0x0a,
-	0x0d, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x25,
-	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
-	0x2e, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x78,
-	0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x3b, 0x82,
-	0xd3, 0xe4, 0x93, 0x02, 0x35, 0x3a, 0x01, 0x2a, 0x22, 0x30, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e,
-	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x75, 0x6e, 0x70, 0x61,
-	0x63, 0x6b, 0x2d, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x93, 0x01, 0x0a, 0x0b, 0x55,
-	0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x23, 0x2e, 0x72, 0x69, 0x6c,
-	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x70,
-	0x61, 0x63, 0x6b, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
-	0x31, 0x2e, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x39, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x33, 0x3a, 0x01, 0x2a,
-	0x22, 0x2e, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f,
-	0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69,
-	0x6c, 0x65, 0x73, 0x2f, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x2d, 0x65, 0x6d, 0x70, 0x74, 0x79,
-	0x12, 0xc0, 0x01, 0x0a, 0x17, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x74,
-	0x72, 0x69, 0x63, 0x73, 0x56, 0x69, 0x65, 0x77, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x2f, 0x2e, 0x72,
-	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47,
-	0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x56, 0x69,
-	0x65, 0x77, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x30, 0x2e,
+	0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x72, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x71, 0x0a,
+	0x0c, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x12, 0x24, 0x2e,
 	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
-	0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x56,
-	0x69, 0x65, 0x77, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x42, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x3c, 0x3a, 0x01, 0x2a, 0x22, 0x37, 0x2f, 0x76, 0x31, 0x2f,
-	0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x67, 0x65,
-	0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x2d, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x2d, 0x76,
-	0x69, 0x65, 0x77, 0x12, 0xa1, 0x01, 0x0a, 0x10, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65,
-	0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x12, 0x28, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
-	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72,
-	0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
-	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73,
-	0x6f, 0x6c, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x38, 0x82,
-	0xd3, 0xe4, 0x93, 0x02, 0x32, 0x3a, 0x01, 0x2a, 0x22, 0x2d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e,
-	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x2f, 0x72,
-	0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x12, 0xa1, 0x01, 0x0a, 0x10, 0x47, 0x65, 0x6e, 0x65,
-	0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x12, 0x28, 0x2e, 0x72,
+	0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c,
+	0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x14, 0x82, 0xd3, 0xe4, 0x93,
+	0x02, 0x0e, 0x12, 0x0c, 0x2f, 0x76, 0x31, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73,
+	0x12, 0x9b, 0x01, 0x0a, 0x0d, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x78, 0x61, 0x6d, 0x70,
+	0x6c, 0x65, 0x12, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x78, 0x61, 0x6d, 0x70,
+	0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
+	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x70, 0x61,
+	0x63, 0x6b, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x3b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x35, 0x3a, 0x01, 0x2a, 0x22, 0x30, 0x2f, 0x76,
+	0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73,
+	0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f,
+	0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x2d, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x93,
+	0x01, 0x0a, 0x0b, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x23,
+	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
+	0x2e, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x6d, 0x70, 0x74,
+	0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x39, 0x82, 0xd3, 0xe4, 0x93, 0x02,
+	0x33, 0x3a, 0x01, 0x2a, 0x22, 0x2e, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
+	0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64,
+	0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x2d, 0x65,
+	0x6d, 0x70, 0x74, 0x79, 0x12, 0xc0, 0x01, 0x0a, 0x17, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74,
+	0x65, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x56, 0x69, 0x65, 0x77, 0x46, 0x69, 0x6c, 0x65,
+	0x12, 0x2f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+	0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x74, 0x72, 0x69,
+	0x63, 0x73, 0x56, 0x69, 0x65, 0x77, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x30, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x74, 0x72,
+	0x69, 0x63, 0x73, 0x56, 0x69, 0x65, 0x77, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x42, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x3c, 0x3a, 0x01, 0x2a, 0x22, 0x37,
+	0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69,
+	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65,
+	0x73, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x2d, 0x6d, 0x65, 0x74, 0x72, 0x69,
+	0x63, 0x73, 0x2d, 0x76, 0x69, 0x65, 0x77, 0x12, 0xa1, 0x01, 0x0a, 0x10, 0x47, 0x65, 0x6e, 0x65,
+	0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x12, 0x28, 0x2e, 0x72,
 	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47,
-	0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x52,
+	0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x52,
 	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
 	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74,
-	0x65, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
 	0x65, 0x22, 0x38, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x32, 0x3a, 0x01, 0x2a, 0x22, 0x2d, 0x2f, 0x76,
 	0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73,
 	0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61,
-	0x74, 0x65, 0x2f, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x12, 0x76, 0x0a, 0x07, 0x47,
-	0x65, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67, 0x73,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67,
-	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x28, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x22, 0x12, 0x20, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73,
-	0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6c,
-	0x6f, 0x67, 0x73, 0x12, 0x84, 0x01, 0x0a, 0x09, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x6f, 0x67,
-	0x73, 0x12, 0x21, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x6f, 0x67, 0x73,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x28,
-	0x12, 0x26, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f,
-	0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6c, 0x6f,
-	0x67, 0x73, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x30, 0x01, 0x12, 0x8d, 0x01, 0x0a, 0x0d, 0x4c,
-	0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x25, 0x2e, 0x72,
-	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c,
-	0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2d, 0x82, 0xd3, 0xe4,
-	0x93, 0x02, 0x27, 0x12, 0x25, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d,
-	0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x9a, 0x01, 0x0a, 0x0e, 0x57,
-	0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x26, 0x2e,
-	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
-	0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x35,
-	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2f, 0x12, 0x2d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74,
-	0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f,
-	0x69, 0x64, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x2d, 0x2f,
-	0x77, 0x61, 0x74, 0x63, 0x68, 0x30, 0x01, 0x12, 0x86, 0x01, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x52,
-	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x72,
-	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47,
-	0x65, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26, 0x12, 0x24, 0x2f, 0x76, 0x31, 0x2f,
+	0x74, 0x65, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x12, 0xa1, 0x01, 0x0a, 0x10,
+	0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72,
+	0x12, 0x28, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+	0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x6e, 0x64, 0x65,
+	0x72, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x72, 0x69, 0x6c,
+	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e,
+	0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x38, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x32, 0x3a, 0x01, 0x2a,
+	0x22, 0x2d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f,
+	0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x67, 0x65,
+	0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x2f, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x12,
+	0x76, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x1f, 0x2e, 0x72, 0x69, 0x6c,
+	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
+	0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x72, 0x69,
+	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65,
+	0x74, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x28, 0x82,
+	0xd3, 0xe4, 0x93, 0x02, 0x22, 0x12, 0x20, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61,
+	0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69,
+	0x64, 0x7d, 0x2f, 0x6c, 0x6f, 0x67, 0x73, 0x12, 0x84, 0x01, 0x0a, 0x09, 0x57, 0x61, 0x74, 0x63,
+	0x68, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x21, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x6f, 0x67,
+	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68,
+	0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2e, 0x82, 0xd3,
+	0xe4, 0x93, 0x02, 0x28, 0x12, 0x26, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
+	0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64,
+	0x7d, 0x2f, 0x6c, 0x6f, 0x67, 0x73, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x30, 0x01, 0x12, 0x8d,
+	0x01, 0x0a, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
+	0x12, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+	0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x2d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x27, 0x12, 0x25, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73,
+	0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x9a,
+	0x01, 0x0a, 0x0e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x73, 0x12, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
+	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63,
+	0x68, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x35, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2f, 0x12, 0x2d, 0x2f, 0x76, 0x31, 0x2f,
 	0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61,
 	0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x12, 0x8c, 0x01, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x12,
-	0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
-	0x31, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
+	0x73, 0x2f, 0x2d, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x30, 0x01, 0x12, 0x86, 0x01, 0x0a, 0x0b,
+	0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x23, 0x2e, 0x72, 0x69,
+	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65,
+	0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26, 0x12, 0x24,
+	0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69,
+	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x12, 0x8c, 0x01, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6c,
+	0x6f, 0x72, 0x65, 0x12, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
 	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x35, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2f,
-	0x12, 0x2d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f,
-	0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x72, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x65, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x12,
-	0xac, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61, 0x72, 0x74,
-	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2a, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70,
+	0x6c, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x35, 0x82, 0xd3,
+	0xe4, 0x93, 0x02, 0x2f, 0x12, 0x2d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
+	0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64,
+	0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x65, 0x78, 0x70, 0x6c,
+	0x6f, 0x72, 0x65, 0x12, 0xac, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c,
+	0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2a, 0x2e, 0x72, 0x69, 0x6c,
+	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
+	0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
 	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65,
-	0x6c, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
-	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61, 0x72,
-	0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x3d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x37, 0x12, 0x35, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x7b, 0x6d, 0x6f, 0x64,
-	0x65, 0x6c, 0x7d, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x8e,
-	0x01, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
-	0x12, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
-	0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
-	0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x2e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x28, 0x3a, 0x01, 0x2a, 0x22, 0x23, 0x2f, 0x76, 0x31, 0x2f,
-	0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x12,
-	0x90, 0x01, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x12, 0x2c, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
-	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f,
-	0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x2f, 0x6d, 0x65,
-	0x74, 0x61, 0x12, 0xa2, 0x01, 0x0a, 0x11, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x43, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
-	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79,
-	0x7a, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x43, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x36, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x30, 0x12, 0x2e, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x2f,
-	0x61, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x12, 0xb3, 0x01, 0x0a, 0x16, 0x4c, 0x69, 0x73, 0x74,
-	0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0x73, 0x12, 0x2e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
-	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65,
-	0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
-	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65,
-	0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x38, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x32, 0x12, 0x30, 0x2f, 0x76, 0x31,
+	0x6c, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x3d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x37, 0x12, 0x35, 0x2f, 0x76, 0x31,
+	0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f,
+	0x7b, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x7d, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x12, 0x8e, 0x01, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x12, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
+	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69,
+	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x2e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x28, 0x3a, 0x01, 0x2a, 0x22, 0x23,
+	0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69,
+	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x74, 0x72, 0x69, 0x67,
+	0x67, 0x65, 0x72, 0x12, 0x90, 0x01, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x12, 0x2c, 0x2e, 0x72,
+	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c,
+	0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76,
+	0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x72, 0x69, 0x6c,
+	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73,
+	0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72,
+	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1b, 0x82, 0xd3, 0xe4, 0x93, 0x02,
+	0x15, 0x12, 0x13, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
+	0x73, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x12, 0xa2, 0x01, 0x0a, 0x11, 0x41, 0x6e, 0x61, 0x6c, 0x79,
+	0x7a, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x29, 0x2e, 0x72,
+	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41,
+	0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a,
+	0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x36, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x30, 0x12, 0x2e, 0x2f, 0x76, 0x31,
 	0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74,
 	0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x6f, 0x72, 0x73, 0x2f, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x12, 0x70, 0x0a,
-	0x0b, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54, 0x12, 0x23, 0x2e, 0x72,
-	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x49,
-	0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x16, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x10, 0x3a,
-	0x01, 0x2a, 0x22, 0x0b, 0x2f, 0x76, 0x31, 0x2f, 0x64, 0x65, 0x76, 0x2d, 0x6a, 0x77, 0x74, 0x12,
-	0x9e, 0x01, 0x0a, 0x10, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x56, 0x61, 0x72, 0x69, 0x61,
-	0x62, 0x6c, 0x65, 0x73, 0x12, 0x28, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x56, 0x61,
-	0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29,
-	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
-	0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65,
-	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x35, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x2f, 0x12, 0x2d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73,
-	0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x76,
-	0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x2f, 0x61, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65,
-	0x42, 0xbb, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x08, 0x41, 0x70, 0x69, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x72, 0x69, 0x6c, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x72, 0x69, 0x6c, 0x6c, 0x2f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x72, 0x69, 0x6c, 0x6c, 0x2f, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x76, 0x31, 0xa2, 0x02, 0x03, 0x52, 0x52, 0x58, 0xaa, 0x02, 0x0f, 0x52, 0x69, 0x6c, 0x6c, 0x2e,
-	0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0f, 0x52, 0x69, 0x6c,
-	0x6c, 0x5c, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1b, 0x52,
-	0x69, 0x6c, 0x6c, 0x5c, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47,
-	0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x11, 0x52, 0x69, 0x6c,
-	0x6c, 0x3a, 0x3a, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6f, 0x72, 0x73, 0x2f, 0x61, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x12, 0xb3, 0x01, 0x0a, 0x16,
+	0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x2e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74,
+	0x69, 0x66, 0x69, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74,
+	0x69, 0x66, 0x69, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x38, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x32, 0x12,
+	0x30, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b,
+	0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x63, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x2f, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72,
+	0x73, 0x12, 0x70, 0x0a, 0x0b, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54,
+	0x12, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+	0x76, 0x31, 0x2e, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76,
+	0x4a, 0x57, 0x54, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x16, 0x82, 0xd3, 0xe4,
+	0x93, 0x02, 0x10, 0x3a, 0x01, 0x2a, 0x22, 0x0b, 0x2f, 0x76, 0x31, 0x2f, 0x64, 0x65, 0x76, 0x2d,
+	0x6a, 0x77, 0x74, 0x12, 0x9e, 0x01, 0x0a, 0x10, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x56,
+	0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x28, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79,
+	0x7a, 0x65, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x56, 0x61, 0x72, 0x69,
+	0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x35, 0x82,
+	0xd3, 0xe4, 0x93, 0x02, 0x2f, 0x12, 0x2d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61,
+	0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69,
+	0x64, 0x7d, 0x2f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x2f, 0x61, 0x6e, 0x61,
+	0x6c, 0x79, 0x7a, 0x65, 0x42, 0xbb, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x72, 0x69, 0x6c,
+	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x08, 0x41, 0x70,
+	0x69, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, 0x69, 0x6c, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x72, 0x69,
+	0x6c, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x72, 0x69, 0x6c,
+	0x6c, 0x2f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x72, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x52, 0x52, 0x58, 0xaa, 0x02, 0x0f, 0x52,
+	0x69, 0x6c, 0x6c, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02,
+	0x0f, 0x52, 0x69, 0x6c, 0x6c, 0x5c, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5c, 0x56, 0x31,
+	0xe2, 0x02, 0x1b, 0x52, 0x69, 0x6c, 0x6c, 0x5c, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5c,
+	0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02,
+	0x11, 0x52, 0x69, 0x6c, 0x6c, 0x3a, 0x3a, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x3a, 0x3a,
+	0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/proto/gen/rill/runtime/v1/api.pb.validate.go b/proto/gen/rill/runtime/v1/api.pb.validate.go
index fb5685858bd..1925539f96a 100644
--- a/proto/gen/rill/runtime/v1/api.pb.validate.go
+++ b/proto/gen/rill/runtime/v1/api.pb.validate.go
@@ -6778,6 +6778,8 @@ func (m *ListResourcesRequest) validate(all bool) error {
 
 	// no validation rules for Path
 
+	// no validation rules for SkipChecks
+
 	if len(errors) > 0 {
 		return ListResourcesRequestMultiError(errors)
 	}
@@ -7319,6 +7321,8 @@ func (m *GetResourceRequest) validate(all bool) error {
 		}
 	}
 
+	// no validation rules for SkipChecks
+
 	if len(errors) > 0 {
 		return GetResourceRequestMultiError(errors)
 	}
diff --git a/proto/gen/rill/runtime/v1/runtime.swagger.yaml b/proto/gen/rill/runtime/v1/runtime.swagger.yaml
index dc8189f934d..3d5618ac0da 100644
--- a/proto/gen/rill/runtime/v1/runtime.swagger.yaml
+++ b/proto/gen/rill/runtime/v1/runtime.swagger.yaml
@@ -2542,6 +2542,10 @@ paths:
           in: query
           required: false
           type: string
+        - name: skipChecks
+          in: query
+          required: false
+          type: boolean
       tags:
         - RuntimeService
   /v1/instances/{instanceId}/resources:
@@ -2573,6 +2577,11 @@ paths:
           in: query
           required: false
           type: string
+        - name: skipChecks
+          description: Skip security checks
+          in: query
+          required: false
+          type: boolean
       tags:
         - RuntimeService
   /v1/instances/{instanceId}/resources/-/watch:
diff --git a/proto/rill/runtime/v1/api.proto b/proto/rill/runtime/v1/api.proto
index a244ca028a2..25cfe9cf0d7 100644
--- a/proto/rill/runtime/v1/api.proto
+++ b/proto/rill/runtime/v1/api.proto
@@ -651,6 +651,8 @@ message ListResourcesRequest {
   string kind = 2;
   // Filter by resource path (optional).
   string path = 3;
+  // Skip security checks
+  bool skip_checks = 4;
 }
 
 message ListResourcesResponse {
@@ -673,6 +675,7 @@ message WatchResourcesResponse {
 message GetResourceRequest {
   string instance_id = 1;
   ResourceName name = 2;
+  bool skip_checks = 3;
 }
 
 message GetResourceResponse {
diff --git a/runtime/server/controller.go b/runtime/server/controller.go
index 3ce8d175280..1c70711884a 100644
--- a/runtime/server/controller.go
+++ b/runtime/server/controller.go
@@ -33,6 +33,7 @@ func (s *Server) ListResources(ctx context.Context, req *runtimev1.ListResources
 	observability.AddRequestAttributes(ctx,
 		attribute.String("args.instance_id", req.InstanceId),
 		attribute.String("args.kind", req.Kind),
+		attribute.Bool("args.skip_checks", req.SkipChecks),
 	)
 
 	if !auth.GetClaims(ctx).CanInstance(req.InstanceId, auth.ReadObjects) {
@@ -61,10 +62,6 @@ func (s *Server) ListResources(ctx context.Context, req *runtimev1.ListResources
 		return strings.Compare(an.Name, bn.Name)
 	})
 
-	// Check if the requester is an admin
-	claims := auth.GetClaims(ctx)
-	isAdmin := claims.SecurityClaims().Admin()
-
 	i := 0
 	for i < len(rs) {
 		r := rs[i]
@@ -72,10 +69,11 @@ func (s *Server) ListResources(ctx context.Context, req *runtimev1.ListResources
 		if err != nil {
 			return nil, status.Error(codes.InvalidArgument, err.Error())
 		}
-		// Admins can see all resources, even if they don't have access.
-		if !isAdmin && !access {
+		// Check of the request is to skip security checks
+		if !req.SkipChecks && !access {
 			// Remove from the slice
 			rs[i] = rs[len(rs)-1]
+			rs[len(rs)-1] = nil
 			rs = rs[:len(rs)-1]
 			continue
 		}
@@ -159,6 +157,7 @@ func (s *Server) GetResource(ctx context.Context, req *runtimev1.GetResourceRequ
 		attribute.String("args.instance_id", req.InstanceId),
 		attribute.String("args.name.kind", req.Name.Kind),
 		attribute.String("args.name.name", req.Name.Name),
+		attribute.Bool("args.skip_checks", req.SkipChecks),
 	)
 
 	if !auth.GetClaims(ctx).CanInstance(req.InstanceId, auth.ReadObjects) {
@@ -182,7 +181,7 @@ func (s *Server) GetResource(ctx context.Context, req *runtimev1.GetResourceRequ
 	if err != nil {
 		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
-	if !access {
+	if !req.SkipChecks && !access {
 		return nil, status.Error(codes.NotFound, "resource not found")
 	}
 
diff --git a/web-common/src/proto/gen/rill/runtime/v1/api_pb.ts b/web-common/src/proto/gen/rill/runtime/v1/api_pb.ts
index a23aa611aa5..caa9a53e034 100644
--- a/web-common/src/proto/gen/rill/runtime/v1/api_pb.ts
+++ b/web-common/src/proto/gen/rill/runtime/v1/api_pb.ts
@@ -2801,6 +2801,13 @@ export class ListResourcesRequest extends Message<ListResourcesRequest> {
    */
   path = "";
 
+  /**
+   * Skip security checks
+   *
+   * @generated from field: bool skip_checks = 4;
+   */
+  skipChecks = false;
+
   constructor(data?: PartialMessage<ListResourcesRequest>) {
     super();
     proto3.util.initPartial(data, this);
@@ -2812,6 +2819,7 @@ export class ListResourcesRequest extends Message<ListResourcesRequest> {
     { no: 1, name: "instance_id", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 2, name: "kind", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 3, name: "path", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 4, name: "skip_checks", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): ListResourcesRequest {
@@ -2986,6 +2994,11 @@ export class GetResourceRequest extends Message<GetResourceRequest> {
    */
   name?: ResourceName;
 
+  /**
+   * @generated from field: bool skip_checks = 3;
+   */
+  skipChecks = false;
+
   constructor(data?: PartialMessage<GetResourceRequest>) {
     super();
     proto3.util.initPartial(data, this);
@@ -2996,6 +3009,7 @@ export class GetResourceRequest extends Message<GetResourceRequest> {
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
     { no: 1, name: "instance_id", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 2, name: "name", kind: "message", T: ResourceName },
+    { no: 3, name: "skip_checks", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): GetResourceRequest {
diff --git a/web-common/src/runtime-client/gen/index.schemas.ts b/web-common/src/runtime-client/gen/index.schemas.ts
index db9cc8a482d..2528f305762 100644
--- a/web-common/src/runtime-client/gen/index.schemas.ts
+++ b/web-common/src/runtime-client/gen/index.schemas.ts
@@ -69,11 +69,13 @@ export type RuntimeServiceWatchResourcesParams = {
 export type RuntimeServiceListResourcesParams = {
   kind?: string;
   path?: string;
+  skipChecks?: boolean;
 };
 
 export type RuntimeServiceGetResourceParams = {
   "name.kind"?: string;
   "name.name"?: string;
+  skipChecks?: boolean;
 };
 
 export type QueryServiceExportReportBody = {

From baa6274cf3a53ab8c468aeb658819c74ebbba5ab Mon Sep 17 00:00:00 2001
From: Cyrus Goh <hello@cyrusgoh.com>
Date: Mon, 27 Jan 2025 12:41:57 -0800
Subject: [PATCH 11/48] Canvas: Grid and Layout (#6438)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add VL config tab, cosmetic changes

* Use deepmerge for merging configs

* Split multi and single select field input

* Add dot menu for chart fields

* Center align KPI content

* Add default title to charts

* Remove optional labels

* Fix bug in multi select

* KPI sparkline fainter, add plus to diff

* Remove whitespace before percent symbol

* Add canvas filters store

* Move state out of granular filter components

* Add canvas filters UI

* Add support for multi metrics view for a common filer

* Add method for fetching multiple metrics dimensions

* Use new canvas resolver api

* Initial time controls integration

* Add new keys to canvas panel, update styles

* Create class and readables for valid spec

* Add loading state from spec store

* Style as per mock

* Move dimension/measure selectors to spec class

* Move timefilterstore as a method to canvas entity

* Move all selectors to canvas spec

* Review

* Fix bug in all time store

* Fix stale cache issues

* Add measure dimension to metrics map

* Measure filter for multiple metrics

* Add dimensions for measure filter

* support multiple metrics view in dimension filter chip

* Cleanup

* Change label for one color

* Add tooltips style to default tooltip id

* Simplify chart specs

* Use canvas instead of svg for viz

* Add formating to tooltips

* format axis

* cleanup

* Use field as formatter name

* Support time dimension in chart

* Add stacked area chart

* Add dimension filter to panel UI

* Read filter from YAML

* Remove unused var

* Wrap parsed expression

* Avoid overwriting on other component

* Use component filter for KPI and charts

* Add note for table

* Toggle filter bar visibility

* Make dimension chip smaller

* Lint fix

* Use canvas store for table component

* Add validator to spec

* Use cross instead of minus for multi input

* Add alignment input to markdown

* Remove hardcoded values

* Remove unused selectors

* Validate schema for KPI

* Cleaner selectors for KPI

* Add validation to charts

* Lint fix

* Remove leftover comment

* Increase health check concurrency to 32 (#6488)

* fix : db file does not get deleted if mutate/rename gets errored/cancelled mid way (#6494)

* version can leak if mutate errors in between

* also fix create

* Increase timeout for graceful controller shutdown to 30s (#6500)

* remove referenced columns, gap

* row based component addition, change default size

* fix find available pos logic, default size tweaks, select new component index

* wip

* disallow dragging in grid

* comment out resize handle

* drag n drop, w/ ghost line

* fix regression

* data selected style

* ability to drag to new row

* remove local z index

* clean up

* clean up

* simplify handle drop with helpers

* check if dragged item is full width when dropping in bottom pos

* wip

* open inspector when a canvas item is selected

* null check and clean up in sliding words

* tweak other components' default size

* removed, in favor of group items by row

* scroll into view after adding new component

* add more data-attributes

* data-row-index, data-column-index

* remove resize handle

* compact grid upon item removal

* left aligned on deletion

* left align when drag and drop

* add drag handle

* fix handledrop with bottom, left, right

* update selected index to follow the dropped item

* types

* move helpers to util

* only allowed to drag around when dragging draghandle

* tweak padding, pos of drag handle

* GhostLine to DropTargetLine

* data-hovered in Component

* shadow tweak

* tweak drag handle

* layout shift border fix when selected

* row container

* wip

* comments

* fixme

* wip

* nit

* fix drop target line, drop position

* rebase fix

* rebase fix

* use new items when dispatching update

* row resize handle

* resize row height polish

* nit

* enforce resizing row cursor

* col resize handle

* spread components evenly

* update yaml after deleting

* col resize improvement

* add a placeholder component min width when resizing col

* redistribute when adding

* clean up

* clean up

* disable redistributing when adding component

* embed to disable interactivity

* remove top pos usage

* disable redistribute in deleteComponent

* lint

* fix drop targets

* Revert "fix drop targets"

This reverts commit a87bddf7cef80ba2fea251a8aa9027f9d1d90b6c.

* clean up

* row to top

* use transform for positioning

* items dropping fix, clean up

* types, open inspector

* nit

* spread evenly on click

* floating button group

* row resizer

* column resizer

* clean up

* empty state items

* cherry pick fix

* skip test

* lint

* visual tweaks

* visual tweaks

* rebase fixes

* white bg in blank canvas

* context menu add component initial

* chart icon in blank menu items

* other menu canva icons

* add component to blank canvas

* icons to add component menu

* move blank canvas one level down

* move addComponent to canvas, wip

* wip

* wip

* reset canvas new file gen, wip

* rebase fix

* lint

* rebase fix

* clean up

* remove intrinsic padding of component, preview el

* blank state box shadow

* tweak row resizer placement, no physical space until hover

* color change on row resizer

* col resizer tweaks

* undo canvas filters comment

* handle drops into empty spaces

* clean up

* revert

* remove scale

* undo drag handle in embed

* revert

* rename

* comment out col, row resizer, focus on layout

* use card styles from figma

* comment out custom dnd

* comment out unused

* initialize gridstack

* add embed to gridstack

* workaround for spec gapx and gapy in gridstack margin

* pass spec to embed

* gap tweaks

* use original set doc when adding new component

* readd filters to preview

* clean up

* tick to wait for dom changes, avoid racy

* use data-index when dragging/resizing

* move filters to canvas, visual checks

* dynamic column count for smaller screen handle

* lint

* lint

* lint

* deselect event from gridstack

* use default dashword width

* clean up

* improve deselect, click inside canvas but outside of grid stack

* left click to open contextmenu in blank canvas

* style tweaks

* remove test

* fix possible racy when updating grid on drag

* lint

* selection style

* remove old files

* clean up util

* major dev clean up, reset component defaultSize

* lint

* further improve canvas selection

* enhance single column mode

* defaultSize tweaks

* improve canvas selection one more time

* Revert "improve canvas selection one more time"

This reverts commit 984a979bb13709a610facd4f4968656aa8f53113.

* keep sidebar config selection, improve deselect

* rebase fixes

* fix

* Revert "keep sidebar config selection, improve deselect"

This reverts commit 29dc0318f042a72bf97d83fbf47cc6c7a162ec54.

* lint

* lint

* remove log

* fixes

* clean up

* const gridstack options

* use data-index for scroll to

* fix

* fixes

* lint

* feedback

---------

Co-authored-by: Dhiraj Kumar <sumankumaribarnwal@gmail.com>
Co-authored-by: Benjamin Egelund-Müller <b@egelund-muller.com>
Co-authored-by: Anshul Khandelwal <12948312+k-anshul@users.noreply.github.com>
---
 package-lock.json                             |  18 +
 .../src/features/embeds/CanvasEmbed.svelte    |  10 +-
 .../-/dashboards/[dashboard]/+page.svelte     |  10 +-
 web-common/package.json                       |   1 +
 .../RemovableListBody.svelte                  |  24 +-
 .../src/components/forms/IconSwitcher.svelte  |  51 +++
 .../components/tooltip/SlidingWords.svelte    |  10 +-
 .../src/features/canvas/BlankCanvas.svelte    |  82 +++++
 web-common/src/features/canvas/Canvas.svelte  | 188 +++++++++--
 .../features/canvas/CanvasComponent.svelte    |  91 ++++++
 .../canvas/CanvasDashboardEmbed.svelte        |  80 ++---
 .../canvas/CanvasDashboardPreview.svelte      | 308 +++++++-----------
 .../canvas/CanvasDashboardWrapper.svelte      |  31 ++
 .../src/features/canvas/Component.svelte      | 108 ------
 .../features/canvas/DashboardWrapper.svelte   |  75 -----
 .../src/features/canvas/GridLines.svelte      |  51 ---
 .../src/features/canvas/PreviewElement.svelte | 125 +------
 .../src/features/canvas/ResizeHandle.svelte   |  77 -----
 .../features/canvas/SvelteGridStack.svelte    | 259 +++++++++++++++
 .../canvas/components/AddComponentMenu.svelte |  23 +-
 .../canvas/components/charts/Chart.svelte     |  18 +-
 .../canvas/components/charts/index.ts         |   2 +-
 .../canvas/components/charts/selector.ts      |  91 +++++-
 .../features/canvas/components/image/index.ts |   2 +-
 .../features/canvas/components/kpi/KPI.svelte | 184 ++++++-----
 .../features/canvas/components/kpi/index.ts   |   2 +-
 .../canvas/components/kpi/selector.ts         | 206 +++++++-----
 .../components/markdown/Markdown.svelte       |  16 +-
 .../canvas/components/markdown/index.ts       |  22 +-
 .../canvas/components/markdown/util.ts        |  31 ++
 .../components/table/TableTemplate.svelte     |  59 ++--
 .../features/canvas/components/table/index.ts |   2 +-
 .../canvas/components/table/selector.ts       | 154 +++------
 .../src/features/canvas/components/types.ts   |   7 +
 .../src/features/canvas/components/util.ts    |   2 +-
 .../features/canvas/components/validators.ts  |  45 +++
 web-common/src/features/canvas/constants.ts   |  11 +-
 .../canvas/icons/BigNumberIcon.svelte         |  29 ++
 .../features/canvas/icons/ChartIcon.svelte    |  19 ++
 .../features/canvas/icons/ImageIcon.svelte    |  19 ++
 .../features/canvas/icons/TableIcon.svelte    |  19 ++
 .../src/features/canvas/icons/TextIcon.svelte |  19 ++
 .../canvas/inspector/AlignmentInput.svelte    |  81 +++++
 .../canvas/inspector/ComponentsEditor.svelte  |  10 +-
 .../canvas/inspector/MultiFieldInput.svelte   |  33 +-
 .../canvas/inspector/PageEditor.svelte        | 134 +++++---
 .../canvas/inspector/ParamMapper.svelte       |  37 ++-
 .../filters/DimensionFiltersInput.svelte      | 164 ++++++++++
 .../{ => filters}/FiltersMapper.svelte        |  21 +-
 .../src/features/canvas/inspector/types.ts    |   4 +-
 .../canvas/stores/canvas-component.ts         |  27 ++
 .../features/canvas/stores/canvas-entity.ts   | 102 +++++-
 .../features/canvas/stores/canvas-filters.ts  |  38 ++-
 .../src/features/canvas/stores/canvas-spec.ts |  24 ++
 web-common/src/features/canvas/types.ts       |  28 +-
 web-common/src/features/canvas/util.ts        |  96 ++++--
 .../dashboards/filters/FilterButton.svelte    |  14 +-
 .../dimension-filters/DimensionFilter.svelte  |   2 +
 .../dashboards/pivot/PivotDisplay.svelte      |   4 +-
 .../dashboards/pivot/pivot-data-store.ts      |  20 +-
 .../dashboards/pivot/pivot-expansion.ts       |   6 +-
 .../dashboards/pivot/pivot-queries.ts         |  20 +-
 .../src/features/dashboards/pivot/types.ts    |   8 +-
 .../rows-viewer/RowsViewerAccordion.svelte    |   4 +-
 .../src/features/file-explorer/new-files.ts   |   8 -
 web-common/src/features/templates/utils.ts    |   2 +-
 .../visual-editing/SidebarWrapper.svelte      |   7 +-
 .../workspaces/CanvasWorkspace.svelte         |  39 ++-
 .../routes/(viz)/canvas/[name]/+page.svelte   |   6 +-
 69 files changed, 2269 insertions(+), 1251 deletions(-)
 create mode 100644 web-common/src/components/forms/IconSwitcher.svelte
 create mode 100644 web-common/src/features/canvas/BlankCanvas.svelte
 create mode 100644 web-common/src/features/canvas/CanvasComponent.svelte
 create mode 100644 web-common/src/features/canvas/CanvasDashboardWrapper.svelte
 delete mode 100644 web-common/src/features/canvas/Component.svelte
 delete mode 100644 web-common/src/features/canvas/DashboardWrapper.svelte
 delete mode 100644 web-common/src/features/canvas/GridLines.svelte
 delete mode 100644 web-common/src/features/canvas/ResizeHandle.svelte
 create mode 100644 web-common/src/features/canvas/SvelteGridStack.svelte
 create mode 100644 web-common/src/features/canvas/components/markdown/util.ts
 create mode 100644 web-common/src/features/canvas/components/validators.ts
 create mode 100644 web-common/src/features/canvas/icons/BigNumberIcon.svelte
 create mode 100644 web-common/src/features/canvas/icons/ChartIcon.svelte
 create mode 100644 web-common/src/features/canvas/icons/ImageIcon.svelte
 create mode 100644 web-common/src/features/canvas/icons/TableIcon.svelte
 create mode 100644 web-common/src/features/canvas/icons/TextIcon.svelte
 create mode 100644 web-common/src/features/canvas/inspector/AlignmentInput.svelte
 create mode 100644 web-common/src/features/canvas/inspector/filters/DimensionFiltersInput.svelte
 rename web-common/src/features/canvas/inspector/{ => filters}/FiltersMapper.svelte (71%)
 create mode 100644 web-common/src/features/canvas/stores/canvas-component.ts

diff --git a/package-lock.json b/package-lock.json
index 75fe237c6eb..f429cd467dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17257,6 +17257,23 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/gridstack": {
+      "version": "11.3.0",
+      "resolved": "https://registry.npmjs.org/gridstack/-/gridstack-11.3.0.tgz",
+      "integrity": "sha512-Z0eRovKcZTRTs3zetJwjO6CNwrgIy845WfOeZGk8ybpeMCE8fMA8tScyKU72Y2M6uGHkjgwnjflglvPiv+RcBQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "paypal",
+          "url": "https://www.paypal.me/alaind831"
+        },
+        {
+          "type": "venmo",
+          "url": "https://www.venmo.com/adumesny"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/gunzip-maybe": {
       "version": "1.4.2",
       "dev": true,
@@ -35312,6 +35329,7 @@
         "d3-time-format": "^4.1.0",
         "deepmerge": "^4.3.1",
         "dompurify": "^3.1.0",
+        "gridstack": "^11.3.0",
         "jsdom": "^23.0.1",
         "json-schema": "^0.4.0",
         "lucide-svelte": "^0.298.0",
diff --git a/web-admin/src/features/embeds/CanvasEmbed.svelte b/web-admin/src/features/embeds/CanvasEmbed.svelte
index c5074ae2a87..b851ae51e07 100644
--- a/web-admin/src/features/embeds/CanvasEmbed.svelte
+++ b/web-admin/src/features/embeds/CanvasEmbed.svelte
@@ -8,14 +8,14 @@
   export let instanceId: string;
   export let canvasName: string;
 
-  // TODO: Remove later
-  let columns = 20;
-  let gap = 1;
   $: canvasQuery = useResource(instanceId, canvasName, ResourceKind.Canvas);
 
   $: canvas = $canvasQuery.data?.canvas.spec;
 
-  $: ({ items = [] } = canvas || { items: [], columns: 24, gap: 2 });
+  $: ({ items = [], filtersEnabled } = canvas || {
+    items: [],
+    filtersEnabled: true,
+  });
 </script>
 
-<CanvasDashboardEmbed {columns} {items} {gap} />
+<CanvasDashboardEmbed {items} showFilterBar={filtersEnabled} spec={canvas} />
diff --git a/web-admin/src/routes/[organization]/[project]/-/dashboards/[dashboard]/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/dashboards/[dashboard]/+page.svelte
index eb75686caef..46b2c5906f6 100644
--- a/web-admin/src/routes/[organization]/[project]/-/dashboards/[dashboard]/+page.svelte
+++ b/web-admin/src/routes/[organization]/[project]/-/dashboards/[dashboard]/+page.svelte
@@ -14,10 +14,10 @@
 
   $: canvas = $canvasQuery.data?.canvas.spec;
 
-  // TODO: Remove later
-  let columns = 20;
-  let gap = 1;
-  $: ({ items = [] } = canvas || { items: [], columns: 24, gap: 2 });
+  $: ({ items = [], filtersEnabled } = canvas || {
+    items: [],
+    filtersEnabled: true,
+  });
 </script>
 
-<CanvasDashboardEmbed {columns} {items} {gap} />
+<CanvasDashboardEmbed {items} showFilterBar={filtersEnabled} spec={canvas} />
diff --git a/web-common/package.json b/web-common/package.json
index 62d51197839..67537c27994 100644
--- a/web-common/package.json
+++ b/web-common/package.json
@@ -67,6 +67,7 @@
     "d3-time-format": "^4.1.0",
     "deepmerge": "^4.3.1",
     "dompurify": "^3.1.0",
+    "gridstack": "^11.3.0",
     "jsdom": "^23.0.1",
     "json-schema": "^0.4.0",
     "lucide-svelte": "^0.298.0",
diff --git a/web-common/src/components/chip/removable-list-chip/RemovableListBody.svelte b/web-common/src/components/chip/removable-list-chip/RemovableListBody.svelte
index 425510be7f8..c8796c18ae2 100644
--- a/web-common/src/components/chip/removable-list-chip/RemovableListBody.svelte
+++ b/web-common/src/components/chip/removable-list-chip/RemovableListBody.svelte
@@ -2,6 +2,7 @@
   export let label: string;
   export let values: string[];
   export let show = 1;
+  export let smallChip = false;
   export let labelMaxWidth = "160px";
   export let valueMaxWidth = "320px";
 
@@ -9,17 +10,26 @@
 </script>
 
 <div class="flex gap-x-2 items-center">
-  <span class="font-bold truncate" style:max-width={labelMaxWidth}>
+  <span
+    class="font-bold truncate"
+    style:max-width={smallChip ? "150px" : labelMaxWidth}
+  >
     {label}
   </span>
 
-  {#each values.slice(0, show) as value (value)}
-    <span class="truncate" style:max-width={valueMaxWidth}>
-      {value}
-    </span>
-  {/each}
+  {#if !smallChip}
+    {#each values.slice(0, show) as value (value)}
+      <span class="truncate" style:max-width={valueMaxWidth}>
+        {value}
+      </span>
+    {/each}
+  {/if}
 
-  {#if values.length > 1}
+  {#if smallChip}
+    <span class="italic">
+      {values.length} selected
+    </span>
+  {:else if values.length > 1}
     <span class="italic">
       +{whatsLeft} other{#if whatsLeft !== 1}s{/if}
     </span>
diff --git a/web-common/src/components/forms/IconSwitcher.svelte b/web-common/src/components/forms/IconSwitcher.svelte
new file mode 100644
index 00000000000..c1b07529b32
--- /dev/null
+++ b/web-common/src/components/forms/IconSwitcher.svelte
@@ -0,0 +1,51 @@
+<script lang="ts">
+  import type { ComponentType, SvelteComponent } from "svelte";
+
+  export let fields: { id: string; Icon: ComponentType<SvelteComponent> }[];
+  export let selected: string | undefined;
+  export let onClick: (value: string) => void = () => {};
+  export let small = false;
+  export let expand = false;
+</script>
+
+<div class:small class:expand class="option-wrapper">
+  {#each fields as { id, Icon } (id)}
+    <button
+      on:click={() => onClick(id)}
+      class="-ml-[1px] first-of-type:-ml-0 px-2 border border-gray-300 first-of-type:rounded-l-[2px] last-of-type:rounded-r-[2px]"
+      class:selected={selected === id}
+    >
+      <Icon size={small ? "14px" : "16px"} />
+    </button>
+  {/each}
+</div>
+
+<style lang="postcss">
+  button {
+    @apply flex justify-center items-center;
+    @apply capitalize;
+  }
+
+  button:hover:not(.selected) {
+    @apply bg-slate-50;
+  }
+
+  .option-wrapper {
+    @apply flex h-6 text-sm w-fit mb-1 rounded-[2px];
+  }
+
+  .option-wrapper.small {
+    @apply h-6 text-xs;
+  }
+
+  .expand {
+    @apply w-full;
+  }
+  .expand button {
+    @apply flex-1;
+  }
+
+  .option-wrapper > .selected {
+    @apply border-primary-500 z-50 text-primary-500;
+  }
+</style>
diff --git a/web-common/src/components/tooltip/SlidingWords.svelte b/web-common/src/components/tooltip/SlidingWords.svelte
index 27ecdd8e933..884eff431d3 100644
--- a/web-common/src/components/tooltip/SlidingWords.svelte
+++ b/web-common/src/components/tooltip/SlidingWords.svelte
@@ -9,18 +9,26 @@
   let mounted = false;
   let duration = 0;
   let timer;
-  let element;
+  let element: HTMLElement | null = null;
 
   let thingWidth = tweened(0, { duration: 50 });
 
   onMount(() => {
+    if (!element) return;
+
     const obs = new ResizeObserver(() => {
+      if (!element) return;
       const bbox = element.getBoundingClientRect();
       thingWidth.set(bbox.width);
     });
+
     obs.observe(element);
     thingWidth.set(element.getBoundingClientRect().width, { duration: 0 });
     mounted = true;
+
+    return () => {
+      obs.disconnect();
+    };
   });
 
   function setDuration() {
diff --git a/web-common/src/features/canvas/BlankCanvas.svelte b/web-common/src/features/canvas/BlankCanvas.svelte
new file mode 100644
index 00000000000..7613ae1840d
--- /dev/null
+++ b/web-common/src/features/canvas/BlankCanvas.svelte
@@ -0,0 +1,82 @@
+<script lang="ts">
+  import { PlusCircleIcon } from "lucide-svelte";
+  import {
+    ContextMenu,
+    ContextMenuContent,
+    ContextMenuItem,
+    ContextMenuTrigger,
+  } from "@rilldata/web-common/components/context-menu";
+  import type { CanvasComponentType } from "./components/types";
+  import type { ComponentType, SvelteComponent } from "svelte";
+  import ChartIcon from "./icons/ChartIcon.svelte";
+  import TableIcon from "./icons/TableIcon.svelte";
+  import TextIcon from "./icons/TextIcon.svelte";
+  import BigNumberIcon from "./icons/BigNumberIcon.svelte";
+  import { createEventDispatcher } from "svelte";
+
+  const dispatch = createEventDispatcher();
+
+  const menuItems: {
+    id: CanvasComponentType;
+    label: string;
+    icon: ComponentType<SvelteComponent>;
+  }[] = [
+    { id: "bar_chart", label: "Chart", icon: ChartIcon },
+    { id: "table", label: "Table", icon: TableIcon },
+    { id: "markdown", label: "Text", icon: TextIcon },
+    { id: "kpi", label: "KPI", icon: BigNumberIcon },
+    { id: "image", label: "Image", icon: ChartIcon },
+  ];
+
+  function handleAddComponent(componentType: CanvasComponentType) {
+    dispatch("add", { type: componentType });
+  }
+
+  function handleButtonClick(event: MouseEvent) {
+    const contextMenuEvent = new MouseEvent("contextmenu", {
+      bubbles: true,
+      clientX: event.clientX,
+      clientY: event.clientY,
+    });
+    event.target?.dispatchEvent(contextMenuEvent);
+  }
+</script>
+
+<div class="size-full p-4 bg-white">
+  <ContextMenu>
+    <ContextMenuTrigger>
+      <button
+        type="button"
+        class="blank-canvas-button flex flex-col items-center gap-2 p-8 rounded-[6px] border border-slate-200 w-full"
+        on:click={handleButtonClick}
+      >
+        <PlusCircleIcon class="w-6 h-6 text-slate-500" />
+        <span class="text-sm font-medium text-slate-500">Add a component</span>
+      </button>
+    </ContextMenuTrigger>
+    <ContextMenuContent>
+      {#each menuItems as item}
+        <ContextMenuItem
+          on:click={() => handleAddComponent(item.id)}
+          class="text-gray-700 text-xs"
+        >
+          <div class="flex flex-row gap-x-2">
+            <svelte:component this={item.icon} />
+            <span class="text-gray-700 text-xs font-normal">{item.label}</span>
+          </div>
+        </ContextMenuItem>
+      {/each}
+    </ContextMenuContent>
+  </ContextMenu>
+</div>
+
+<style lang="postcss">
+  .blank-canvas-button:hover {
+    /* card-hover */
+    box-shadow:
+      0px 2px 3px 0px rgba(15, 23, 42, 0.03),
+      0px 1px 3px 0px rgba(15, 23, 42, 0.04),
+      0px 0px 0px 1px rgba(15, 23, 42, 0.06),
+      0px 4px 6px 0px rgba(15, 23, 42, 0.09);
+  }
+</style>
diff --git a/web-common/src/features/canvas/Canvas.svelte b/web-common/src/features/canvas/Canvas.svelte
index 6a20c1b8e4e..eb5b7f08cb4 100644
--- a/web-common/src/features/canvas/Canvas.svelte
+++ b/web-common/src/features/canvas/Canvas.svelte
@@ -1,10 +1,17 @@
 <script lang="ts">
-  import CanvasDashboardPreview from "@rilldata/web-common/features/canvas/CanvasDashboardPreview.svelte";
+  import CanvasDashboardPreview from "./CanvasDashboardPreview.svelte";
   import { getCanvasStateManagers } from "@rilldata/web-common/features/canvas/state-managers/state-managers";
-  import type { Vector } from "@rilldata/web-common/features/canvas/types";
   import type { FileArtifact } from "@rilldata/web-common/features/entity-management/file-artifact";
   import type { V1CanvasSpec } from "@rilldata/web-common/runtime-client";
   import { parseDocument } from "yaml";
+  import { workspaces } from "@rilldata/web-common/layout/workspace/workspace-stores";
+  import { useDefaultMetrics } from "./selector";
+  import { getComponentRegistry } from "./components/util";
+  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { findNextAvailablePosition } from "./util";
+  import type { CanvasComponentType } from "./components/types";
+  import BlankCanvas from "./BlankCanvas.svelte";
+  import CanvasFilters from "@rilldata/web-common/features/canvas/filters/CanvasFilters.svelte";
 
   export let fileArtifact: FileArtifact;
 
@@ -17,72 +24,181 @@
     },
   } = ctx;
 
-  let showGrid = true;
+  const { canvasEntity } = getCanvasStateManagers();
 
-  // TODO: Remove later when we move to new tiling system
-  const columns = 24;
-  const gap = 1;
+  $: workspaceLayout = workspaces.get(fileArtifact.path);
+  // Open inspector when a canvas item is selected
+  $: if ($selectedIndex !== null && $selectedIndex !== undefined) {
+    workspaceLayout.inspector.open();
+  }
 
   let spec: V1CanvasSpec = {
     items: [],
+    filtersEnabled: true,
   };
 
   $: ({ saveLocalContent, updateEditorContent, editorContent } = fileArtifact);
 
   $: spec = structuredClone($canvasSpec ?? spec);
 
-  $: ({ items = [] } = spec);
+  $: ({ items = [], filtersEnabled } = spec);
+
+  $: ({ instanceId } = $runtime);
+
+  $: metricsViewQuery = useDefaultMetrics(instanceId);
+
+  const componentRegistry = getComponentRegistry();
+
+  async function deleteComponent(index: number) {
+    if (index === undefined || index === null) {
+      console.error("[Canvas] Invalid index for deletion:", index);
+      return;
+    }
+
+    const itemToDelete = items[index];
+    if (!itemToDelete) return;
+
+    const updatedItems = [...items.slice(0, index), ...items.slice(index + 1)];
+
+    const parsedDocument = parseDocument($editorContent ?? "");
+    const rawItems = parsedDocument.get("items") as any;
+    rawItems.delete(index);
+
+    updatedItems.forEach((item, idx) => {
+      const node = rawItems.get(idx);
+      if (!node) return;
+
+      const updates = {
+        width: item.width,
+        height: item.height,
+        x: item.x,
+        y: item.y,
+      };
+
+      Object.entries(updates).forEach(([key, value]) => node.set(key, value));
+    });
+
+    updateEditorContent(parsedDocument.toString(), true);
+    items = updatedItems;
+    canvasEntity.setSelectedComponentIndex(null);
+    await saveLocalContent();
+  }
 
-  async function handleDeleteEvent(
+  async function handleDelete(
     e: CustomEvent<{
       index: number;
     }>,
   ) {
-    if (!e.detail.index) return;
+    if (e.detail.index === undefined || e.detail.index === null) return;
     await deleteComponent(e.detail.index);
   }
 
-  async function deleteComponent(index: number) {
-    const parsedDocument = parseDocument($editorContent ?? "");
-
-    const items = parsedDocument.get("items") as any;
-    if (!items) return;
-    items.delete(index);
-    updateEditorContent(parsedDocument.toString(), false, true);
-    await saveLocalContent();
-  }
-
-  async function handlePreviewUpdate(
+  function handleUpdate(
     e: CustomEvent<{
       index: number;
-      position: Vector;
-      dimensions: Vector;
+      x: number;
+      y: number;
+      w: number;
+      h: number;
     }>,
   ) {
     const parsedDocument = parseDocument($editorContent ?? "");
     const items = parsedDocument.get("items") as any;
 
+    if (!items) {
+      console.warn("[Canvas] No items found in document");
+      return;
+    }
+
     const node = items.get(e.detail.index);
+    if (node) {
+      node.set("width", e.detail.w);
+      node.set("height", e.detail.h);
+      node.set("x", e.detail.x);
+      node.set("y", e.detail.y);
+    }
+
+    updateEditorContent(parsedDocument.toString(), false, true);
+  }
+
+  function addComponent(componentType: CanvasComponentType) {
+    const defaultMetrics = $metricsViewQuery?.data;
+    if (!defaultMetrics) return;
+
+    const newSpec = componentRegistry[componentType].newComponentSpec(
+      defaultMetrics.metricsView,
+      defaultMetrics.measure,
+      defaultMetrics.dimension,
+    );
+
+    const { width, height } = componentRegistry[componentType].defaultSize;
 
-    node.set("width", e.detail.dimensions[0]);
-    node.set("height", e.detail.dimensions[1]);
-    node.set("x", e.detail.position[0]);
-    node.set("y", e.detail.position[1]);
+    const parsedDocument = parseDocument($editorContent ?? "");
+    const items = parsedDocument.get("items") as any;
+
+    const itemsToPosition =
+      spec?.items?.map((item) => ({
+        x: item.x ?? 0,
+        y: item.y ?? 0,
+        width: item.width ?? 0,
+        height: item.height ?? 0,
+      })) ?? [];
+
+    const [x, y] = findNextAvailablePosition(itemsToPosition, width, height);
+
+    const newComponent = {
+      component: { [componentType]: newSpec },
+      height,
+      width,
+      x,
+      y,
+    };
+
+    if (!items) {
+      parsedDocument.set("items", [newComponent]);
+    } else {
+      items.add(newComponent);
+    }
 
     updateEditorContent(parsedDocument.toString(), false, true);
-    await saveLocalContent();
+    canvasEntity.setSelectedComponentIndex(itemsToPosition.length);
+    scrollToComponent(itemsToPosition.length);
+  }
+
+  function scrollToComponent(index: number) {
+    setTimeout(() => {
+      const component = document.querySelector(`[data-index="${index}"]`);
+      if (component) {
+        component.scrollIntoView({ behavior: "smooth", block: "center" });
+      }
+    }, 100);
+  }
+
+  async function handleAdd(e: CustomEvent<{ type: CanvasComponentType }>) {
+    await addComponent(e.detail.type);
   }
 </script>
 
-<CanvasDashboardPreview
-  {gap}
-  {items}
-  {columns}
-  {showGrid}
-  selectedIndex={$selectedIndex}
-  on:update={handlePreviewUpdate}
-  on:delete={handleDeleteEvent}
-/>
+{#if filtersEnabled}
+  <div
+    id="header"
+    class="border-b w-fit min-w-full flex flex-col bg-slate-50 slide"
+  >
+    <CanvasFilters />
+  </div>
+{/if}
+
+{#if items.length === 0}
+  <BlankCanvas on:add={handleAdd} />
+{:else}
+  <CanvasDashboardPreview
+    {items}
+    {spec}
+    activeIndex={$selectedIndex}
+    on:update={handleUpdate}
+    on:delete={handleDelete}
+  />
+{/if}
 
 <svelte:window
   on:keydown={async (e) => {
diff --git a/web-common/src/features/canvas/CanvasComponent.svelte b/web-common/src/features/canvas/CanvasComponent.svelte
new file mode 100644
index 00000000000..c44d51ff100
--- /dev/null
+++ b/web-common/src/features/canvas/CanvasComponent.svelte
@@ -0,0 +1,91 @@
+<script lang="ts" context="module">
+  import { builderActions, getAttrs, type Builder } from "bits-ui";
+  import {
+    ResourceKind,
+    useResource,
+  } from "../entity-management/resource-selectors";
+  import ComponentRenderer from "@rilldata/web-common/features/canvas/components/ComponentRenderer.svelte";
+</script>
+
+<script lang="ts">
+  export let i: number;
+  export let builders: Builder[] = [];
+  export let embed = false;
+  export let selected = false;
+  export let componentName: string;
+  export let instanceId: string;
+
+  let isHovered = false;
+
+  $: resourceQuery = useResource(
+    instanceId,
+    componentName,
+    ResourceKind.Component,
+  );
+  $: ({ data: componentResource } = $resourceQuery);
+
+  $: ({ renderer, rendererProperties } =
+    componentResource?.component?.spec ?? {});
+
+  $: title = rendererProperties?.title;
+  $: description = rendererProperties?.description;
+
+  function handleMouseEnter() {
+    if (embed) return;
+    isHovered = true;
+  }
+
+  function handleMouseLeave() {
+    if (embed) return;
+    isHovered = false;
+  }
+</script>
+
+<div
+  {...getAttrs(builders)}
+  use:builderActions={{ builders }}
+  role="presentation"
+  data-index={i}
+  class="canvas-component pointer-events-auto size-full"
+  data-selected={selected}
+  data-hovered={isHovered}
+  class:!cursor-default={embed}
+  style:z-index={renderer === "select" ? 100 : 0}
+  on:contextmenu
+  on:pointerenter
+  on:pointerleave
+  on:mouseenter={handleMouseEnter}
+  on:mouseleave={handleMouseLeave}
+>
+  <div class="size-full relative">
+    <div class="size-full overflow-hidden flex flex-col flex-none">
+      <div class="size-full overflow-hidden flex flex-col gap-y-1 flex-none">
+        {#if title || description}
+          <div class="w-full h-fit flex flex-col border-b bg-white p-2">
+            {#if title}
+              <h1 class="text-slate-700">{title}</h1>
+            {/if}
+            {#if description}
+              <h2 class="text-slate-600 leading-none">{description}</h2>
+            {/if}
+          </div>
+        {/if}
+        {#if renderer && rendererProperties}
+          <ComponentRenderer {renderer} {componentName} />
+        {/if}
+      </div>
+    </div>
+  </div>
+</div>
+
+<style lang="postcss">
+  h1 {
+    font-size: 16px;
+    font-weight: 500;
+  }
+
+  h2 {
+    font-size: 12px;
+    font-weight: 400;
+  }
+</style>
diff --git a/web-common/src/features/canvas/CanvasDashboardEmbed.svelte b/web-common/src/features/canvas/CanvasDashboardEmbed.svelte
index 205016be4b5..05983d9aaaf 100644
--- a/web-common/src/features/canvas/CanvasDashboardEmbed.svelte
+++ b/web-common/src/features/canvas/CanvasDashboardEmbed.svelte
@@ -1,28 +1,23 @@
 <script lang="ts">
-  import CanvasFilters from "@rilldata/web-common/features/canvas/filters/CanvasFilters.svelte";
-  import { type V1CanvasItem } from "@rilldata/web-common/runtime-client";
+  import {
+    type V1CanvasItem,
+    type V1CanvasSpec,
+  } from "@rilldata/web-common/runtime-client";
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-  import Component from "./Component.svelte";
-  import * as defaults from "./constants";
-  import DashboardWrapper from "./DashboardWrapper.svelte";
+  import CanvasComponent from "./CanvasComponent.svelte";
+  import CanvasDashboardWrapper from "./CanvasDashboardWrapper.svelte";
+  import SvelteGridStack from "./SvelteGridStack.svelte";
+  import type { GridStack } from "gridstack";
+  import CanvasFilters from "@rilldata/web-common/features/canvas/filters/CanvasFilters.svelte";
 
-  export let columns = 20;
   export let items: V1CanvasItem[];
-  export let gap = 1;
-  export let chartView = false;
+  export let showFilterBar = true;
+  export let spec: V1CanvasSpec;
 
   let contentRect: DOMRectReadOnly = new DOMRectReadOnly(0, 0, 0, 0);
-  $: ({ instanceId } = $runtime);
-
-  const dashboardWidth = chartView
-    ? defaults.DASHBOARD_WIDTH / 2
-    : defaults.DASHBOARD_WIDTH;
+  let grid: GridStack;
 
-  $: gridWidth = contentRect.width;
-  $: scale = gridWidth / dashboardWidth;
-  $: gapSize = dashboardWidth * (gap / 1000);
-  $: gridCell = dashboardWidth / columns;
-  $: radius = gridCell * defaults.COMPONENT_RADIUS;
+  $: instanceId = $runtime.instanceId;
 
   $: maxBottom = items.reduce((max, el) => {
     const bottom = Number(el.height) + Number(el.y);
@@ -30,37 +25,22 @@
   }, 0);
 </script>
 
-<div
-  id="header"
-  class="border-b w-fit min-w-full flex flex-col bg-slate-50 slide"
->
-  <CanvasFilters />
-</div>
+{#if showFilterBar}
+  <div
+    id="header"
+    class="border-b w-fit min-w-full flex flex-col bg-slate-50 slide"
+  >
+    <CanvasFilters />
+  </div>
+{/if}
 
-<DashboardWrapper
-  bind:contentRect
-  {scale}
-  height={maxBottom * gridCell * scale}
-  width={dashboardWidth}
->
-  {#each items as component, i (i)}
-    {@const componentName = component.component}
-    {#if componentName}
-      <Component
-        embed
-        {i}
-        {instanceId}
-        {componentName}
-        {chartView}
-        {scale}
-        {radius}
-        padding={gapSize}
-        width={Number(component.width ?? defaults.COMPONENT_WIDTH) * gridCell}
-        height={Number(component.height ?? defaults.COMPONENT_HEIGHT) *
-          gridCell}
-        left={Number(component.x) * gridCell}
-        top={Number(component.y) * gridCell}
-      />
-    {/if}
+<CanvasDashboardWrapper bind:contentRect height={maxBottom}>
+  {#each items as _, i (i)}
+    <SvelteGridStack bind:grid {items} {spec} let:index let:item embed>
+      {@const componentName = item.component}
+      {#if componentName}
+        <CanvasComponent embed i={index} {instanceId} {componentName} />
+      {/if}
+    </SvelteGridStack>
   {/each}
-</DashboardWrapper>
+</CanvasDashboardWrapper>
diff --git a/web-common/src/features/canvas/CanvasDashboardPreview.svelte b/web-common/src/features/canvas/CanvasDashboardPreview.svelte
index 6d678b4f209..ae58548212e 100644
--- a/web-common/src/features/canvas/CanvasDashboardPreview.svelte
+++ b/web-common/src/features/canvas/CanvasDashboardPreview.svelte
@@ -1,222 +1,162 @@
 <script lang="ts">
-  import CanvasFilters from "@rilldata/web-common/features/canvas/filters/CanvasFilters.svelte";
   import { getCanvasStateManagers } from "@rilldata/web-common/features/canvas/state-managers/state-managers";
-  import type { V1CanvasItem } from "@rilldata/web-common/runtime-client";
+  import type {
+    V1CanvasItem,
+    V1CanvasSpec,
+  } from "@rilldata/web-common/runtime-client";
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-  import { createEventDispatcher } from "svelte";
-  import * as defaults from "./constants";
-  import DashboardWrapper from "./DashboardWrapper.svelte";
   import PreviewElement from "./PreviewElement.svelte";
-  import type { Vector } from "./types";
-  import { vector } from "./util";
-
-  const dispatch = createEventDispatcher();
-  const zeroVector = [0, 0] as [0, 0];
+  import SvelteGridStack from "./SvelteGridStack.svelte";
+  import type {
+    GridItemHTMLElement,
+    GridStack,
+    GridStackNode,
+  } from "gridstack";
+  import { createEventDispatcher } from "svelte";
+  import CanvasDashboardWrapper from "./CanvasDashboardWrapper.svelte";
+  import { clickOutside } from "@rilldata/web-common/lib/actions/click-outside";
 
-  export let columns: number | undefined;
   export let items: V1CanvasItem[];
-  export let gap: number | undefined;
-  export let showGrid = false;
-  export let snap = true;
-  export let selectedIndex: number | null = null;
+  export let activeIndex: number | null = null;
+  export let spec: V1CanvasSpec;
 
   const { canvasEntity } = getCanvasStateManagers();
+  const dispatch = createEventDispatcher();
 
   let contentRect: DOMRectReadOnly = new DOMRectReadOnly(0, 0, 0, 0);
-  let scrollOffset = 0;
-  let changing = false;
-  let startMouse: Vector = [0, 0];
-  let mousePosition: Vector = [0, 0];
-  let initialElementDimensions: Vector = [0, 0];
-  let initialElementPosition: Vector = [0, 0];
-  let dimensionChange: [0 | 1 | -1, 0 | 1 | -1] = [0, 0];
-  let positionChange: [0 | 1, 0 | 1] = [0, 0];
-
-  $: ({ instanceId } = $runtime);
-
-  $: gridWidth = contentRect.width;
-  $: scale = gridWidth / defaults.DASHBOARD_WIDTH;
-
-  $: gapSize = defaults.DASHBOARD_WIDTH * ((gap ?? defaults.GAP_SIZE) / 1000);
-  $: gridCell = defaults.DASHBOARD_WIDTH / (columns ?? defaults.COLUMN_COUNT);
-  $: radius = gridCell * defaults.COMPONENT_RADIUS;
-  $: gridVector = [gridCell, gridCell] as Vector;
-
-  $: mouseDelta = vector.divide(vector.subtract(mousePosition, startMouse), [
-    scale,
-    scale,
-  ]);
-
-  $: dragPosition = vector.add(
-    vector.multiply(mouseDelta, positionChange),
-    initialElementPosition,
-  );
-
-  $: resizeDimenions = vector.add(
-    vector.multiply(mouseDelta, dimensionChange),
-    initialElementDimensions,
-  );
+  let grid: GridStack;
+  let gridContainer: HTMLElement;
 
-  $: finalDrag = vector.multiply(getCell(dragPosition, snap), gridVector);
+  $: instanceId = $runtime.instanceId;
 
-  $: finalResize = vector.multiply(getCell(resizeDimenions, snap), gridVector);
+  $: if (grid) {
+    canvasEntity.setGridstack(grid);
+  }
 
-  function handleMouseUp() {
-    if (selectedIndex === null || !changing) return;
+  function handleDelete(e: CustomEvent<{ index: number }>) {
+    items.splice(e.detail.index, 1);
+  }
 
-    const cellPosition = getCell(dragPosition, true);
-    const dimensions = getCell(resizeDimenions, true);
+  $: maxBottom = items.reduce((max, el) => {
+    const bottom = Number(el.height) + Number(el.y);
+    return Math.max(max, bottom);
+  }, 0);
 
-    items[selectedIndex].x = Math.max(
-      0,
-      dimensions[0] < 0 ? cellPosition[0] + dimensions[0] : cellPosition[0],
-    );
-    items[selectedIndex].y = Math.max(
-      0,
-      dimensions[1] < 0 ? cellPosition[1] + dimensions[1] : cellPosition[1],
+  function handleResizeStop(
+    e: CustomEvent<{
+      event: Event;
+      el: GridItemHTMLElement;
+      target: GridItemHTMLElement;
+    }>,
+  ) {
+    // Get index from the resized element's data attribute
+    const contentEl = e.detail.target?.querySelector(
+      ".grid-stack-item-content-item",
     );
+    const index = contentEl?.getAttribute("data-index");
 
-    items[selectedIndex].width = Math.max(1, Math.abs(dimensions[0]));
-    items[selectedIndex].height = Math.max(1, Math.abs(dimensions[1]));
+    if (index === null) {
+      console.error("No index found for resized widget");
+      return;
+    }
+
+    const { w, h, x, y } =
+      (e.detail.target?.gridstackNode as GridStackNode) || {};
 
-    // TODO: Do not update if there is no change
     dispatch("update", {
-      index: selectedIndex,
-      position: [items[selectedIndex].x, items[selectedIndex].y],
-      dimensions: [items[selectedIndex].width, items[selectedIndex].height],
+      index: Number(index), // Use the data-index from the element
+      x: Number(x),
+      y: Number(y),
+      w: Number(w),
+      h: Number(h),
     });
-
-    reset();
-  }
-
-  function reset() {
-    changing = false;
-    mousePosition =
-      startMouse =
-      startMouse =
-      initialElementPosition =
-      initialElementDimensions =
-      dimensionChange =
-      positionChange =
-      resizeDimenions =
-        zeroVector;
   }
 
-  function handleChange(
+  function handleDragStop(
     e: CustomEvent<{
-      e: MouseEvent & { currentTarget: HTMLButtonElement };
-      dimensions: Vector;
-      position: Vector;
-      changeDimensions: [0 | 1 | -1, 0 | 1 | -1];
-      changePosition: [0 | 1, 0 | 1];
+      event: Event;
+      el: GridItemHTMLElement;
+      target: GridItemHTMLElement;
     }>,
   ) {
-    e.preventDefault();
-
-    dimensionChange = e.detail.changeDimensions;
-    positionChange = e.detail.changePosition;
-
-    const index = Number(e.detail.e.currentTarget.dataset.index);
-
-    initialElementDimensions = e.detail.dimensions;
-    initialElementPosition = e.detail.position;
+    const contentEl = e.detail.target?.querySelector(
+      ".grid-stack-item-content-item",
+    );
+    const index = contentEl?.getAttribute("data-index");
 
-    startMouse = [
-      e.detail.e.clientX - contentRect.left,
-      e.detail.e.clientY - contentRect.top - scrollOffset,
-    ];
+    if (index === null) {
+      console.error("No index found for dragged widget");
+      return;
+    }
 
-    mousePosition = startMouse;
+    const { w, h, x, y } =
+      (e.detail.target?.gridstackNode as GridStackNode) || {};
 
-    selectedIndex = index;
-    canvasEntity.setSelectedComponentIndex(selectedIndex);
-    changing = true;
+    dispatch("update", {
+      index: Number(index),
+      x: Number(x),
+      y: Number(y),
+      w: Number(w),
+      h: Number(h),
+    });
   }
 
-  function handleMouseMove(e: MouseEvent) {
-    if (selectedIndex === null || !changing) return;
-
-    mousePosition = [
-      e.clientX - contentRect.left,
-      e.clientY - contentRect.top - scrollOffset,
-    ];
+  function handleSelect(e: CustomEvent<{ index: number }>) {
+    activeIndex = e.detail.index;
+    canvasEntity.setSelectedComponentIndex(activeIndex);
   }
 
-  function handleScroll(
-    e: UIEvent & {
-      currentTarget: EventTarget & HTMLDivElement;
-    },
-  ) {
-    scrollOffset = e.currentTarget.scrollTop;
+  function handleDeselect() {
+    activeIndex = null;
+    canvasEntity.setSelectedComponentIndex(activeIndex);
   }
 
-  function getCell(rawVector: Vector, snap: boolean): Vector {
-    const raw = vector.divide(rawVector, gridVector);
-
-    if (!snap) return raw;
-
-    return [Math.round(raw[0]), Math.round(raw[1])];
-  }
+  function handleClickOutside(event: Event) {
+    const target = event.target as HTMLElement;
+    const canvasEl = target.closest(".canvas");
+    const dashboardThemeBoundaryEl = target.closest(
+      ".dashboard-theme-boundary",
+    );
+    const gridStackEl = target.closest(".grid-stack");
 
-  function deselect() {
-    selectedIndex = null;
-    canvasEntity.setSelectedComponentIndex(selectedIndex);
+    // Only deselect if click is inside canvas or dashboard-theme-boundary but outside grid-stack
+    if ((canvasEl || dashboardThemeBoundaryEl) && !gridStackEl) {
+      activeIndex = null;
+      canvasEntity.setSelectedComponentIndex(activeIndex);
+    }
   }
-
-  $: maxBottom = items.reduce((max, el) => {
-    const bottom = Number(el.height) + Number(el.y);
-    return Math.max(max, bottom);
-  }, 0);
 </script>
 
-<svelte:window on:mousemove={handleMouseMove} on:mouseup={handleMouseUp} />
-
-<div
-  id="header"
-  class="border-b w-fit min-w-full flex flex-col bg-slate-50 slide"
->
-  <CanvasFilters />
-</div>
-
-<DashboardWrapper
-  bind:contentRect
-  {changing}
-  {gapSize}
-  {gridCell}
-  {scrollOffset}
-  {radius}
-  {scale}
-  {showGrid}
-  height={maxBottom * gridCell * scale}
-  width={defaults.DEFAULT_DASHBOARD_WIDTH}
-  on:click={deselect}
-  on:scroll={handleScroll}
->
-  <section
-    class="flex relative justify-between gap-x-4 py-4 pb-6 px-4"
-  ></section>
-  {#each items as component, i (i)}
-    {@const selected = i === selectedIndex}
-    {@const interacting = selected && changing}
-    <PreviewElement
-      {instanceId}
-      {i}
-      {scale}
-      {component}
-      {radius}
-      {selected}
-      {interacting}
-      {gapSize}
-      width={interacting
-        ? finalResize[0]
-        : Number(component.width ?? defaults.COMPONENT_WIDTH) * gridCell}
-      height={interacting
-        ? finalResize[1]
-        : Number(component.height ?? defaults.COMPONENT_HEIGHT) * gridCell}
-      top={interacting ? finalDrag[1] : Number(component.y) * gridCell}
-      left={interacting ? finalDrag[0] : Number(component.x) * gridCell}
-      on:change={handleChange}
-      on:delete
-    />
-  {/each}
-</DashboardWrapper>
+<!-- {#if showFilterBar}
+  <div
+    id="header"
+    class="border-b w-fit min-w-full flex flex-col bg-slate-50 slide"
+  >
+    <CanvasFilters />
+  </div>
+{/if} -->
+
+<CanvasDashboardWrapper bind:contentRect height={maxBottom}>
+  <div bind:this={gridContainer} use:clickOutside={[null, handleClickOutside]}>
+    <SvelteGridStack
+      bind:grid
+      {items}
+      {spec}
+      let:index
+      let:item
+      on:select={handleSelect}
+      on:deselect={handleDeselect}
+      on:resizestop={handleResizeStop}
+      on:dragstop={handleDragStop}
+    >
+      {@const selected = index === activeIndex}
+      <PreviewElement
+        {instanceId}
+        i={index}
+        {selected}
+        component={item}
+        on:delete={handleDelete}
+      />
+    </SvelteGridStack>
+  </div>
+</CanvasDashboardWrapper>
diff --git a/web-common/src/features/canvas/CanvasDashboardWrapper.svelte b/web-common/src/features/canvas/CanvasDashboardWrapper.svelte
new file mode 100644
index 00000000000..de315e865de
--- /dev/null
+++ b/web-common/src/features/canvas/CanvasDashboardWrapper.svelte
@@ -0,0 +1,31 @@
+<script lang="ts">
+  import * as defaults from "./constants";
+  export let height: number;
+  export let contentRect = new DOMRectReadOnly(0, 0, 0, 0);
+  export let bgColor = "bg-white";
+</script>
+
+<div
+  class="dashboard-theme-boundary size-full bg-gray-100 flex justify-center overflow-y-auto"
+  on:scroll
+>
+  <div
+    bind:contentRect
+    class="canvas {bgColor} min-h-full"
+    style:height="{height}px"
+    style:max-width="{defaults.DEFAULT_DASHBOARD_WIDTH}px"
+  >
+    <slot />
+  </div>
+</div>
+
+<style lang="postcss">
+  .canvas {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    user-select: none;
+    margin: 0;
+    pointer-events: auto;
+  }
+</style>
diff --git a/web-common/src/features/canvas/Component.svelte b/web-common/src/features/canvas/Component.svelte
deleted file mode 100644
index 5625de1c33e..00000000000
--- a/web-common/src/features/canvas/Component.svelte
+++ /dev/null
@@ -1,108 +0,0 @@
-<script lang="ts" context="module">
-  import { builderActions, getAttrs, type Builder } from "bits-ui";
-  import type { ComponentType } from "svelte";
-  import { onMount } from "svelte";
-  import {
-    ResourceKind,
-    useResource,
-  } from "../entity-management/resource-selectors";
-  import type ResizeHandle from "./ResizeHandle.svelte";
-  import ComponentRenderer from "@rilldata/web-common/features/canvas/components/ComponentRenderer.svelte";
-  import ComponentTitle from "@rilldata/web-common/features/canvas/ComponentTitle.svelte";
-
-  const options = [0, 0.5, 1];
-  const allSides = options
-    .flatMap((y) => options.map((x) => [x, y] as [number, number]))
-    .filter(([x, y]) => !(x === 0.5 && y === 0.5));
-</script>
-
-<script lang="ts">
-  export let i: number;
-  export let builders: Builder[] = [];
-  export let left: number;
-  export let top: number;
-  export let padding: number;
-  export let scale: number;
-  export let embed = false;
-  export let radius: number;
-  export let selected = false;
-  export let interacting = false;
-  export let width: number;
-  export let height: number;
-  export let localZIndex = 0;
-  export let chartView = false;
-  export let componentName: string;
-  export let instanceId: string;
-
-  $: resourceQuery = useResource(
-    instanceId,
-    componentName,
-    ResourceKind.Component,
-  );
-  $: ({ data: componentResource } = $resourceQuery);
-
-  $: ({ renderer, rendererProperties } =
-    componentResource?.component?.spec ?? {});
-
-  $: title = rendererProperties?.title;
-  $: description = rendererProperties?.description;
-
-  let ResizeHandleComponent: ComponentType<ResizeHandle>;
-
-  onMount(async () => {
-    if (!embed) {
-      ResizeHandleComponent = (await import("./ResizeHandle.svelte")).default;
-    }
-  });
-</script>
-
-<div
-  {...getAttrs(builders)}
-  use:builderActions={{ builders }}
-  role="presentation"
-  data-index={i}
-  class="wrapper hover:cursor-pointer active:cursor-grab pointer-events-auto"
-  class:!cursor-default={embed}
-  style:z-index={renderer === "select" ? 100 : localZIndex}
-  style:padding="{padding}px"
-  style:left="{left}px"
-  style:top="{top}px"
-  style:width="{width}px"
-  style:height={chartView ? undefined : `${height}px`}
-  on:contextmenu
-  on:mousedown|capture
->
-  <div class="size-full relative">
-    {#if ResizeHandleComponent && !embed}
-      {#each allSides as side (side)}
-        <svelte:component
-          this={ResizeHandleComponent}
-          {i}
-          {scale}
-          {side}
-          position={[left, top]}
-          dimensions={[width, height]}
-          {selected}
-          on:change
-        />
-      {/each}
-    {/if}
-
-    <div
-      class="size-full overflow-hidden flex flex-col flex-none"
-      class:shadow-lg={interacting}
-      style:border-radius="{radius}px"
-    >
-      <ComponentTitle {title} {description} />
-      {#if renderer && rendererProperties}
-        <ComponentRenderer {renderer} {componentName} />
-      {/if}
-    </div>
-  </div>
-</div>
-
-<style lang="postcss">
-  .wrapper {
-    @apply absolute;
-  }
-</style>
diff --git a/web-common/src/features/canvas/DashboardWrapper.svelte b/web-common/src/features/canvas/DashboardWrapper.svelte
deleted file mode 100644
index 394895809d4..00000000000
--- a/web-common/src/features/canvas/DashboardWrapper.svelte
+++ /dev/null
@@ -1,75 +0,0 @@
-<script lang="ts">
-  import { type ComponentType, onMount } from "svelte";
-  import type GridLines from "./GridLines.svelte";
-
-  export let width: number;
-  export let height: number;
-  export let scale: number;
-  export let embed = false;
-  export let showGrid = false;
-  export let changing = false;
-  export let scrollOffset = 0;
-  export let gapSize = 0;
-  export let gridCell = 0;
-  export let radius = 0;
-  export let contentRect = new DOMRectReadOnly(0, 0, 0, 0);
-  export let color = "bg-slate-200";
-
-  let GridLinesComponent: ComponentType<GridLines>;
-
-  onMount(async () => {
-    if (!embed) {
-      GridLinesComponent = (await import("./GridLines.svelte")).default;
-    }
-  });
-</script>
-
-<div
-  class="dashboard-theme-boundary size-full bg-gray-100 flex justify-center overflow-y-auto"
-  on:scroll
->
-  <div
-    bind:contentRect
-    class="wrapper {color} max-w-[1440px] min-h-full"
-    style:height="{height}px"
-  >
-    {#if GridLinesComponent && (showGrid || changing)}
-      <svelte:component
-        this={GridLinesComponent}
-        {gridCell}
-        {scrollOffset}
-        {gapSize}
-        {radius}
-        {scale}
-      />
-    {/if}
-    <div role="presentation" class="size-full relative" on:click|self>
-      <div
-        class="dash pointer-events-none"
-        role="presentation"
-        style:width="{width}px"
-        style:height="{height}px"
-        style:transform="scale({scale})"
-      >
-        <slot />
-      </div>
-    </div>
-  </div>
-</div>
-
-<style lang="postcss">
-  .wrapper {
-    width: 100%;
-    height: 100%;
-    position: relative;
-    user-select: none;
-    margin: 0;
-    pointer-events: auto;
-  }
-
-  .dash {
-    transform-origin: top left;
-    position: absolute;
-    touch-action: none;
-  }
-</style>
diff --git a/web-common/src/features/canvas/GridLines.svelte b/web-common/src/features/canvas/GridLines.svelte
deleted file mode 100644
index 4713b7a87ee..00000000000
--- a/web-common/src/features/canvas/GridLines.svelte
+++ /dev/null
@@ -1,51 +0,0 @@
-<script lang="ts">
-  import { fade } from "svelte/transition";
-
-  export let gridCell = 50;
-  export let scrollOffset = 0;
-  export let gapSize: number;
-  export let radius: number;
-  export let scale: number;
-
-  $: clampedGap = Math.max(0.5, gapSize);
-  $: cellSize = gridCell * scale;
-  $: scaledGap = clampedGap * scale;
-</script>
-
-<svg
-  in:fade={{ duration: 200 }}
-  out:fade={{ duration: 700 }}
-  width="100%"
-  height="100%"
-  xmlns="http://www.w3.org/2000/svg"
-  class="bg-slate-100 pointer-events-none"
-  style:position="absolute"
-  style:opacity="1"
->
-  <defs>
-    <pattern
-      y={scrollOffset * -1}
-      id="cd-grid"
-      width={cellSize}
-      height={cellSize}
-      patternUnits="userSpaceOnUse"
-    >
-      <rect
-        rx={radius * scale}
-        x={scaledGap}
-        y={scaledGap}
-        width={cellSize - scaledGap * 2}
-        height={cellSize - scaledGap * 2}
-        class="fill-slate-200"
-      />
-    </pattern>
-  </defs>
-
-  <rect width="100%" height="100%" fill="url(#cd-grid)" />
-</svg>
-
-<style>
-  svg {
-    transform-origin: top left;
-  }
-</style>
diff --git a/web-common/src/features/canvas/PreviewElement.svelte b/web-common/src/features/canvas/PreviewElement.svelte
index 2f44828f103..38714a04fa7 100644
--- a/web-common/src/features/canvas/PreviewElement.svelte
+++ b/web-common/src/features/canvas/PreviewElement.svelte
@@ -1,125 +1,34 @@
 <script context="module" lang="ts">
-  import { goto } from "$app/navigation";
-  import * as ContextMenu from "@rilldata/web-common/components/context-menu";
   import type { V1CanvasItem } from "@rilldata/web-common/runtime-client";
-  import { createEventDispatcher, onMount } from "svelte";
-  import { writable } from "svelte/store";
-  import Component from "./Component.svelte";
-
-  const zIndex = writable(0);
+  import CanvasComponent from "./CanvasComponent.svelte";
 </script>
 
 <script lang="ts">
-  const dispatch = createEventDispatcher();
-
   export let i: number;
-  export let gapSize: number;
   export let component: V1CanvasItem;
   export let selected: boolean;
-  export let interacting: boolean;
-  export let width: number;
-  export let height: number;
-  export let top: number;
-  export let left: number;
-  export let radius: number;
-  export let scale: number;
   export let instanceId: string;
 
-  let localZIndex = 0;
-
   $: componentName = component?.component;
   $: inlineComponent = component?.definedInCanvas;
-
-  $: finalLeft = width < 0 ? left + width : left;
-  $: finalTop = height < 0 ? top + height : top;
-  $: finalWidth = Math.abs(width);
-  $: finalHeight = Math.abs(height);
-  $: padding = gapSize;
-
-  onMount(() => {
-    localZIndex = $zIndex;
-    zIndex.set(++localZIndex);
-  });
-
-  function handleMouseDown(e: MouseEvent) {
-    if (e.button !== 0) return;
-    localZIndex = $zIndex;
-    zIndex.set(++localZIndex);
-    dispatch("change", {
-      e,
-      dimensions: [width, height],
-      position: [finalLeft, finalTop],
-      changeDimensions: [0, 0],
-      changePosition: [1, 1],
-    });
-  }
 </script>
 
 {#if componentName && !inlineComponent}
-  <ContextMenu.Root>
-    <ContextMenu.Trigger asChild let:builder>
-      <Component
-        {instanceId}
-        {i}
-        {localZIndex}
-        {interacting}
-        {componentName}
-        {padding}
-        {radius}
-        {scale}
-        {selected}
-        builders={[builder]}
-        height={finalHeight}
-        left={finalLeft}
-        top={finalTop}
-        width={finalWidth}
-        on:change
-        on:contextmenu
-        on:mousedown={handleMouseDown}
-      />
-    </ContextMenu.Trigger>
-
-    <ContextMenu.Content class="z-[100]">
-      <ContextMenu.Item
-        on:click={async () => {
-          await goto(`/files/charts/${componentName}.yaml`);
-        }}
-      >
-        Go to {componentName}.yaml
-      </ContextMenu.Item>
-      <ContextMenu.Item on:click={() => dispatch("delete", { index: i })}
-        >Delete from dashboard</ContextMenu.Item
-      >
-    </ContextMenu.Content>
-  </ContextMenu.Root>
+  <CanvasComponent
+    {instanceId}
+    {i}
+    {componentName}
+    {selected}
+    on:change
+    on:contextmenu
+  />
 {:else if componentName}
-  <ContextMenu.Root>
-    <ContextMenu.Trigger asChild let:builder>
-      <Component
-        {instanceId}
-        {i}
-        {localZIndex}
-        {interacting}
-        {componentName}
-        {padding}
-        {radius}
-        {scale}
-        {selected}
-        builders={[builder]}
-        height={finalHeight}
-        left={finalLeft}
-        top={finalTop}
-        width={finalWidth}
-        on:change
-        on:contextmenu
-        on:mousedown={handleMouseDown}
-      />
-    </ContextMenu.Trigger>
-
-    <ContextMenu.Content class="z-[100]">
-      <ContextMenu.Item on:click={() => dispatch("delete", { index: i })}
-        >Delete from dashboard</ContextMenu.Item
-      >
-    </ContextMenu.Content>
-  </ContextMenu.Root>
+  <CanvasComponent
+    {instanceId}
+    {i}
+    {componentName}
+    {selected}
+    on:change
+    on:contextmenu
+  />
 {/if}
diff --git a/web-common/src/features/canvas/ResizeHandle.svelte b/web-common/src/features/canvas/ResizeHandle.svelte
deleted file mode 100644
index 7bc8525f749..00000000000
--- a/web-common/src/features/canvas/ResizeHandle.svelte
+++ /dev/null
@@ -1,77 +0,0 @@
-<script lang="ts">
-  import type { Vector } from "./types";
-
-  import { createEventDispatcher } from "svelte";
-
-  const dispatch = createEventDispatcher();
-
-  export let position: Vector;
-  export let dimensions: Vector;
-  export let side: [number, number];
-  export let i: number;
-  export let selected: boolean;
-  export let scale: number;
-
-  $: ew = side[0] !== 0.5;
-  $: ns = side[1] !== 0.5;
-  $: corner = ns && ew;
-  $: span = corner ? 12 : Math.max(0, dimensions[Number(ew)] - 6);
-
-  function handleMouseDown(e: MouseEvent) {
-    dispatch("change", {
-      e,
-      dimensions,
-      position,
-      changeDimensions: [
-        side[0] === 0.5 ? 0 : side[0] ? 1 : -1,
-        side[1] === 0.5 ? 0 : side[1] ? 1 : -1,
-      ],
-      changePosition: [side[0] ? 0 : 1, side[1] ? 0 : 1],
-    });
-  }
-</script>
-
-<button
-  data-index={i}
-  style:width="{span}px"
-  style:left="{side[0] * 100}%"
-  style:top="{side[1] * 100}%"
-  class:rotate-90={ew}
-  class:!z-50={corner}
-  class:cursor-ns-resize={!corner && ns}
-  class:cursor-ew-resize={!corner && ew}
-  class:cursor-nwse-resize={corner && side[0] === side[1]}
-  class:cursor-nesw-resize={corner && side[0] !== side[1]}
-  on:mousedown={handleMouseDown}
->
-  {#if !corner}
-    <span class="line" style:height="{1 / scale}px" class:hide={!selected} />
-  {/if}
-  <span
-    class="square"
-    style:width="{6 / scale}px"
-    style:height="{6 / scale}px"
-    style:border-width="{1 / scale}px"
-    class:hide={!selected}
-  />
-</button>
-
-<style lang="postcss">
-  button {
-    @apply z-40 absolute h-3;
-    @apply -translate-y-1/2 -translate-x-1/2;
-    @apply flex items-center justify-center;
-  }
-
-  .square {
-    @apply aspect-square bg-white border-primary-400 z-50 flex-none;
-  }
-
-  .line {
-    @apply absolute bg-primary-400 w-full;
-  }
-
-  .hide {
-    @apply invisible;
-  }
-</style>
diff --git a/web-common/src/features/canvas/SvelteGridStack.svelte b/web-common/src/features/canvas/SvelteGridStack.svelte
new file mode 100644
index 00000000000..37c25d0aa53
--- /dev/null
+++ b/web-common/src/features/canvas/SvelteGridStack.svelte
@@ -0,0 +1,259 @@
+<!-- Source: https://github.com/SafetZahirovic/SvelteGridStack -->
+<!-- Docs: https://github.com/gridstack/gridstack.js/tree/master/doc -->
+<script lang="ts">
+  import type { GridStack, GridStackNode, GridStackOptions } from "gridstack";
+  import { createEventDispatcher, onDestroy, onMount } from "svelte";
+
+  import "gridstack/dist/gridstack-extra.min.css";
+  import "gridstack/dist/gridstack.min.css";
+  import type { GridstackDispatchEvents } from "./types.ts";
+  import type {
+    V1CanvasItem,
+    V1CanvasSpec,
+  } from "@rilldata/web-common/runtime-client";
+  import * as defaults from "./constants";
+
+  export let items: Array<V1CanvasItem>;
+  export let grid: GridStack;
+  export let embed = false;
+  export let spec: V1CanvasSpec;
+
+  // See: https://github.com/gridstack/gridstack.js/tree/master/doc#events
+  const gridStackEvents = [
+    "added",
+    "change",
+    "disable",
+    "dragstart",
+    "drag",
+    "dragstop",
+    "dropped",
+    "enable",
+    "removed",
+    "resizestart",
+    "resize",
+    "resizestop",
+  ] as const;
+
+  const options = {
+    column: defaults.DEFAULT_COLUMN_COUNT,
+    resizable: {
+      handles: "e,se,s,sw,w",
+    },
+    animate: false,
+    float: true,
+    staticGrid: embed,
+    margin: `${spec?.gapX || defaults.DEFAULT_TOP_BOTTOM_GAP}px ${spec?.gapY || defaults.DEFAULT_LEFT_RIGHT_GAP}px`,
+    columnOpts: {
+      breakpointForWindow: true,
+      breakpoints: [{ w: 912, c: 1 }],
+    },
+  } as GridStackOptions;
+
+  const dispatchGridstackEvent =
+    createEventDispatcher<GridstackDispatchEvents>();
+  const dispatch = createEventDispatcher<{
+    select: { index: number };
+    deselect: void;
+  }>();
+
+  let gridEl: HTMLDivElement;
+
+  // FYI:
+  // There could be a race condition where the grid is updated while dragging
+  // so we need to avoid updating the grid while dragging
+  // Only update the grid when user finishes dragging
+  let isDragging = false;
+
+  function handlePointerDown(event: PointerEvent) {
+    const target = event.target as HTMLElement;
+
+    // Selecting whitespace in the canvas
+    if (target.classList.contains("grid-stack")) {
+      dispatch("deselect");
+      return;
+    }
+
+    // Handle component selection
+    const contentEl = target.closest(".grid-stack-item-content");
+    const itemEl = contentEl?.querySelector(".grid-stack-item-content-item");
+
+    if (itemEl) {
+      const index = itemEl.getAttribute("data-index");
+      if (index !== null) {
+        dispatch("select", { index: parseInt(index, 10) });
+      }
+    }
+  }
+
+  $: if (grid && !isDragging && items) {
+    grid.batchUpdate();
+
+    const currentItems = grid.getGridItems();
+    const newCount = items.length;
+
+    // Only modify items that need changes
+    items.forEach((item, i) => {
+      if (currentItems[i]) {
+        grid.update(currentItems[i], {
+          x: item.x,
+          y: item.y,
+          w: item.width,
+          h: item.height,
+        });
+      } else {
+        grid.addWidget({
+          x: item.x,
+          y: item.y,
+          w: item.width,
+          h: item.height,
+        });
+      }
+    });
+
+    // Remove extra widgets if necessary
+    if (currentItems.length > newCount) {
+      currentItems.slice(newCount).forEach((el) => grid.removeWidget(el, true));
+    }
+
+    grid.commit();
+  }
+
+  onMount(async () => {
+    const { GridStack } = await import("gridstack");
+
+    grid = GridStack.init(options);
+
+    grid.on("dragstart", () => {
+      isDragging = true;
+    });
+
+    grid.on("dragstop", () => {
+      isDragging = false;
+    });
+
+    grid.on("added", async (_: Event, nodes: Array<GridStackNode>) => {
+      grid.batchUpdate();
+
+      setTimeout(() => {
+        nodes.forEach((node) => {
+          const gridItems = grid.getGridItems();
+          const index = gridItems.findIndex((item) => item === node.el);
+
+          const element = gridEl.querySelector(
+            `#grid-id-${index}`,
+          ) as HTMLDivElement;
+          const child = node.el?.firstElementChild;
+
+          if (!child || !element) {
+            console.error("Cannot append element to GridStack", {
+              index,
+              element,
+              child,
+            });
+            return;
+          }
+
+          child.appendChild(element);
+          element.style.display = "block";
+          element.style.width = "100%";
+          element.style.height = "100%";
+        });
+
+        grid.commit();
+      }, 0);
+    });
+
+    gridEl.addEventListener("pointerover", (event) => {
+      if (!embed) {
+        const target = event?.target as HTMLElement;
+        const contentEl = target.closest(".grid-stack-item-content");
+        if (contentEl) {
+          contentEl.setAttribute("data-highlight", "true");
+        }
+      }
+    });
+
+    gridEl.addEventListener("pointerout", (event) => {
+      if (!embed) {
+        const target = event?.target as HTMLElement;
+        const contentEl = target.closest(".grid-stack-item-content");
+        if (contentEl) {
+          contentEl.removeAttribute("data-highlight");
+        }
+      }
+    });
+
+    gridStackEvents.forEach((event) => {
+      grid.on(event, (args: any) => {
+        dispatchGridstackEvent(event, args);
+      });
+    });
+
+    gridEl.addEventListener("pointerdown", handlePointerDown);
+
+    grid.load(items);
+  });
+
+  onDestroy(() => {
+    gridStackEvents.forEach((event) => grid?.off(event));
+    gridEl?.removeEventListener("pointerdown", handlePointerDown);
+
+    if (grid) {
+      grid.removeAll(true);
+    }
+  });
+</script>
+
+<div bind:this={gridEl} class="grid-stack">
+  {#each items as item, index}
+    <div
+      style="display:none"
+      id={`grid-id-${index}`}
+      data-index={index}
+      class="grid-stack-item-content-item"
+    >
+      <slot {index} {item} />
+    </div>
+  {/each}
+</div>
+
+<style lang="postcss">
+  .grid-stack {
+    @apply bg-white;
+  }
+
+  :global(.grid-stack-item-content) {
+    @apply rounded-sm bg-white;
+    @apply border border-gray-200;
+    box-shadow:
+      0px 2px 3px 0px rgba(15, 23, 42, 0.03),
+      0px 1px 3px 0px rgba(15, 23, 42, 0.04),
+      0px 0px 0px 1px rgba(15, 23, 42, 0.06);
+  }
+
+  :global(.grid-stack-item-content[data-highlight="true"]) {
+    box-shadow:
+      0px 2px 3px 0px rgba(15, 23, 42, 0.03),
+      0px 1px 3px 0px rgba(15, 23, 42, 0.04),
+      0px 0px 0px 1px rgba(15, 23, 42, 0.06),
+      0px 4px 6px 0px rgba(15, 23, 42, 0.09);
+  }
+
+  :global(.canvas-component) {
+    border: 2px solid transparent;
+    cursor: grab;
+  }
+
+  :global(.canvas-component:hover) {
+    cursor: pointer !important;
+  }
+
+  :global(.canvas-component:active),
+  :global(.canvas-component.ui-draggable-dragging) {
+    cursor: grabbing !important;
+  }
+
+  :global(.canvas-component[data-selected="true"]) {
+    border-color: var(--color-primary-300);
+  }
+</style>
diff --git a/web-common/src/features/canvas/components/AddComponentMenu.svelte b/web-common/src/features/canvas/components/AddComponentMenu.svelte
index d0374d34556..35fa202f39f 100644
--- a/web-common/src/features/canvas/components/AddComponentMenu.svelte
+++ b/web-common/src/features/canvas/components/AddComponentMenu.svelte
@@ -3,20 +3,26 @@
   import * as DropdownMenu from "@rilldata/web-common/components/dropdown-menu";
   import type { CanvasComponentType } from "@rilldata/web-common/features/canvas/components/types";
   import { ChevronDown, Plus } from "lucide-svelte";
+  import type { ComponentType, SvelteComponent } from "svelte";
+  import ChartIcon from "../icons/ChartIcon.svelte";
+  import TableIcon from "../icons/TableIcon.svelte";
+  import TextIcon from "../icons/TextIcon.svelte";
+  import BigNumberIcon from "../icons/BigNumberIcon.svelte";
 
-  export let addComponent: (componentName: CanvasComponentType) => void;
+  export let addComponent: (componentType: CanvasComponentType) => void;
 
   let open = false;
 
   const menuItems: {
     id: CanvasComponentType;
     label: string;
+    icon: ComponentType<SvelteComponent>;
   }[] = [
-    { id: "markdown", label: "Text" },
-    { id: "kpi", label: "KPI" },
-    { id: "image", label: "Image" },
-    { id: "bar_chart", label: "Chart" },
-    { id: "table", label: "Table" },
+    { id: "bar_chart", label: "Chart", icon: ChartIcon },
+    { id: "table", label: "Table", icon: TableIcon },
+    { id: "markdown", label: "Text", icon: TextIcon },
+    { id: "kpi", label: "KPI", icon: BigNumberIcon },
+    { id: "image", label: "Image", icon: ChartIcon },
   ];
 </script>
 
@@ -34,7 +40,10 @@
     <DropdownMenu.Group>
       {#each menuItems as item}
         <DropdownMenu.Item on:click={() => addComponent(item.id)}>
-          {item.label}
+          <div class="flex flex-row gap-x-2">
+            <svelte:component this={item.icon} />
+            <span class="text-gray-700 text-xs font-normal">{item.label}</span>
+          </div>
         </DropdownMenu.Item>
       {/each}
     </DropdownMenu.Group>
diff --git a/web-common/src/features/canvas/components/charts/Chart.svelte b/web-common/src/features/canvas/components/charts/Chart.svelte
index 1b70dd39a5f..a71acdb6ebe 100644
--- a/web-common/src/features/canvas/components/charts/Chart.svelte
+++ b/web-common/src/features/canvas/components/charts/Chart.svelte
@@ -11,26 +11,28 @@
     V1ComponentSpecRendererProperties,
   } from "@rilldata/web-common/runtime-client";
   import type { View } from "svelte-vega";
-  import { getChartData } from "./selector";
+  import { getChartData, validateChartSchema } from "./selector";
   import type { ChartType } from "./types";
   import { generateSpec, getChartTitle, mergedVlConfig } from "./util";
 
   export let rendererProperties: V1ComponentSpecRendererProperties;
   export let renderer: string;
 
+  const ctx = getCanvasStateManagers();
   const {
     canvasEntity: {
       spec: { getMeasureForMetricView },
     },
-  } = getCanvasStateManagers();
+  } = ctx;
 
-  let stateManagers = getCanvasStateManagers();
   let viewVL: View;
 
   $: chartConfig = rendererProperties as ChartSpec;
   $: chartType = renderer as ChartType;
 
-  $: data = getChartData(stateManagers, chartConfig);
+  $: schema = validateChartSchema(ctx, chartConfig);
+
+  $: data = getChartData(ctx, chartConfig);
   $: spec = generateSpec(chartType, chartConfig, $data);
 
   $: measure = getMeasureForMetricView(
@@ -51,7 +53,7 @@
   $: title = getChartTitle(chartConfig, $data);
 </script>
 
-{#if chartConfig?.x}
+{#if $schema.isValid}
   {#if $data.isFetching}
     <div class="flex items-center h-full w-full">
       <Spinner status={EntityStatus.Running} size="16px" />
@@ -73,4 +75,10 @@
       {config}
     />
   {/if}
+{:else}
+  <div
+    class="flex w-full h-full p-2 text-xl bg-white items-center justify-center text-red-500"
+  >
+    {$schema.error}
+  </div>
 {/if}
diff --git a/web-common/src/features/canvas/components/charts/index.ts b/web-common/src/features/canvas/components/charts/index.ts
index 7bb5a4f6370..4fee1be0b14 100644
--- a/web-common/src/features/canvas/components/charts/index.ts
+++ b/web-common/src/features/canvas/components/charts/index.ts
@@ -19,7 +19,7 @@ export type ChartSpec = ComponentFilterProperties &
 
 export class ChartComponent extends BaseCanvasComponent<ChartSpec> {
   minSize = { width: 4, height: 4 };
-  defaultSize = { width: 12, height: 8 };
+  defaultSize = { width: 6, height: 4 };
 
   constructor(
     fileArtifact: FileArtifact | undefined = undefined,
diff --git a/web-common/src/features/canvas/components/charts/selector.ts b/web-common/src/features/canvas/components/charts/selector.ts
index 9469a56a4b7..8addf69e8b0 100644
--- a/web-common/src/features/canvas/components/charts/selector.ts
+++ b/web-common/src/features/canvas/components/charts/selector.ts
@@ -1,6 +1,11 @@
+import type { ChartSpec } from "@rilldata/web-common/features/canvas/components/charts";
 import type { ChartConfig } from "@rilldata/web-common/features/canvas/components/charts/types";
 import { timeGrainToVegaTimeUnitMap } from "@rilldata/web-common/features/canvas/components/charts/util";
 import type { ComponentFilterProperties } from "@rilldata/web-common/features/canvas/components/types";
+import {
+  validateDimensions,
+  validateMeasures,
+} from "@rilldata/web-common/features/canvas/components/validators";
 import type { StateManagers } from "@rilldata/web-common/features/canvas/state-managers/state-managers";
 import { TIME_GRAIN } from "@rilldata/web-common/lib/time/config";
 import {
@@ -11,7 +16,6 @@ import {
   type V1MetricsViewAggregationMeasure,
   type V1MetricsViewAggregationResponse,
   type V1MetricsViewAggregationResponseDataItem,
-  type V1TimeRange,
 } from "@rilldata/web-common/runtime-client";
 import type { HTTPError } from "@rilldata/web-common/runtime-client/fetchWrapper";
 import type { CreateQueryResult } from "@tanstack/svelte-query";
@@ -98,9 +102,15 @@ export function createChartDataQuery(
   limit = "500",
   offset = "0",
 ): CreateQueryResult<V1MetricsViewAggregationResponse, HTTPError> {
-  const {
-    timeControls: { selectedTimeRange },
-  } = ctx.canvasEntity;
+  const { canvasEntity } = ctx;
+
+  const timeAndFilterStore = canvasEntity.createTimeAndFilterStore(
+    config.metrics_view,
+    {
+      componentTimeRange: config.time_range,
+      componentFilter: config.dimension_filters,
+    },
+  );
 
   let measures: V1MetricsViewAggregationMeasure[] = [];
   let dimensions: V1MetricsViewAggregationDimension[] = [];
@@ -110,14 +120,9 @@ export function createChartDataQuery(
   }
 
   return derived(
-    [ctx.runtime, selectedTimeRange],
-    ([runtime, $selectedTimeRange], set) => {
-      let timeRange: V1TimeRange = {
-        start: $selectedTimeRange?.start?.toISOString(),
-        end: $selectedTimeRange?.end?.toISOString(),
-      };
-
-      const timeGrain = $selectedTimeRange?.interval;
+    [ctx.runtime, timeAndFilterStore],
+    ([runtime, $timeAndFilterStore], set) => {
+      const { timeRange, where, timeGrain } = $timeAndFilterStore;
 
       if (config.x?.type === "nominal" && config.x?.field) {
         dimensions = [{ name: config.x?.field }];
@@ -129,24 +134,21 @@ export function createChartDataQuery(
         dimensions = [...dimensions, { name: config.color.field }];
       }
 
-      if (config.time_range) {
-        timeRange = { isoDuration: config.time_range };
-      }
-
       return createQueryServiceMetricsViewAggregation(
         runtime.instanceId,
         config.metrics_view,
         {
           measures,
           dimensions,
-          where: undefined,
+          where,
           timeRange,
           limit,
           offset,
         },
         {
           query: {
-            enabled: !!$selectedTimeRange?.start && !!$selectedTimeRange?.end,
+            enabled:
+              !!config.time_range || (!!timeRange?.start && !!timeRange?.end),
             queryClient: ctx.queryClient,
             keepPreviousData: true,
           },
@@ -183,3 +185,56 @@ export function getTimeDimensionDefinition(
     };
   });
 }
+
+export function validateChartSchema(
+  ctx: StateManagers,
+  chartSpec: ChartSpec,
+): Readable<{
+  isValid: boolean;
+  error?: string;
+}> {
+  const { metrics_view, x, y, color } = chartSpec;
+  let measures: string[] = [];
+  let dimensions: string[] = [];
+
+  if (y?.field) measures = [y.field];
+  if (x?.field && x.field !== "__time") dimensions = [x.field];
+  if (typeof color === "object" && color?.field)
+    dimensions = [...dimensions, color.field];
+
+  return derived(
+    ctx.canvasEntity.spec.getMetricsViewFromName(metrics_view),
+    (metricsView) => {
+      if (!metricsView) {
+        return {
+          isValid: false,
+          error: `Metrics view ${metrics_view} not found`,
+        };
+      }
+      const validateMeasuresRes = validateMeasures(metricsView, measures);
+      if (!validateMeasuresRes.isValid) {
+        const invalidMeasures = validateMeasuresRes.invalidMeasures.join(", ");
+        return {
+          isValid: false,
+          error: `Invalid measure ${invalidMeasures} selected`,
+        };
+      }
+
+      const validateDimensionsRes = validateDimensions(metricsView, dimensions);
+
+      if (!validateDimensionsRes.isValid) {
+        const invalidDimensions =
+          validateDimensionsRes.invalidDimensions.join(", ");
+
+        return {
+          isValid: false,
+          error: `Invalid dimension(s) ${invalidDimensions} selected`,
+        };
+      }
+      return {
+        isValid: true,
+        error: undefined,
+      };
+    },
+  );
+}
diff --git a/web-common/src/features/canvas/components/image/index.ts b/web-common/src/features/canvas/components/image/index.ts
index 5730c9c96e5..100b9d4361c 100644
--- a/web-common/src/features/canvas/components/image/index.ts
+++ b/web-common/src/features/canvas/components/image/index.ts
@@ -12,7 +12,7 @@ export interface ImageSpec extends ComponentCommonProperties {
 
 export class ImageComponent extends BaseCanvasComponent<ImageSpec> {
   minSize = { width: 1, height: 1 };
-  defaultSize = { width: 5, height: 5 };
+  defaultSize = { width: 2, height: 2 };
 
   constructor(
     fileArtifact: FileArtifact | undefined = undefined,
diff --git a/web-common/src/features/canvas/components/kpi/KPI.svelte b/web-common/src/features/canvas/components/kpi/KPI.svelte
index 5fb06386d6c..8548013688e 100644
--- a/web-common/src/features/canvas/components/kpi/KPI.svelte
+++ b/web-common/src/features/canvas/components/kpi/KPI.svelte
@@ -15,13 +15,13 @@
   import { formatMeasurePercentageDifference } from "@rilldata/web-common/lib/number-formatting/percentage-formatter";
   import { humaniseISODuration } from "@rilldata/web-common/lib/time/ranges/iso-ranges";
   import type { V1ComponentSpecRendererProperties } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
   import { extent } from "d3-array";
   import type { KPISpec } from ".";
   import {
     useKPIComparisonTotal,
     useKPISparkline,
     useKPITotals,
+    validateKPISchema,
   } from "./selector";
 
   export let rendererProperties: V1ComponentSpecRendererProperties;
@@ -32,42 +32,27 @@
   let containerWidth: number;
   let containerHeight: number;
 
-  $: instanceId = $runtime?.instanceId;
   $: kpiProperties = rendererProperties as KPISpec;
 
   $: ({
     metrics_view: metricsViewName,
     measure: measureName,
-    time_range: timeRange,
     sparkline: showSparkline,
     comparison_range: comparisonTimeRange,
   } = kpiProperties);
 
+  $: schema = validateKPISchema(ctx, kpiProperties);
   $: measure = spec.getMeasureForMetricView(measureName, metricsViewName);
 
-  $: measureValue = useKPITotals(
-    ctx,
-    instanceId,
-    metricsViewName,
-    measureName,
-    timeRange,
-  );
+  $: measureValue = useKPITotals(ctx, kpiProperties, $schema.isValid);
 
   $: comparisonValue = useKPIComparisonTotal(
     ctx,
-    instanceId,
-    metricsViewName,
-    measureName,
-    comparisonTimeRange,
+    kpiProperties,
+    $schema.isValid,
   );
 
-  $: sparkline = useKPISparkline(
-    ctx,
-    instanceId,
-    metricsViewName,
-    measureName,
-    timeRange,
-  );
+  $: sparkline = useKPISparkline(ctx, kpiProperties, $schema.isValid);
 
   $: sparkData = $sparkline?.data || [];
   $: isEmptySparkline = sparkData.every((y) => y[measureName] === null);
@@ -108,85 +93,98 @@
   }
 </script>
 
-{#if measure}
-  <div
-    bind:clientWidth={containerWidth}
-    bind:clientHeight={containerHeight}
-    class="flex flex-col h-full w-full bg-white pt-4 items-center gap-y-1"
-  >
-    <div class="measure-label">{$measure?.displayName || measureName}</div>
-    <div class="measure-value">{measureValueFormatted}</div>
-    <div class="flex items-center">
-      {#if $comparisonValue.data}
-        <div class="flex items-baseline gap-x-3 text-sm">
-          <div
-            role="complementary"
-            class="w-fit max-w-full overflow-hidden text-ellipsis text-gray-500"
-            class:font-semibold={$measureValue.data && $measureValue.data >= 0}
-          >
-            {#if $comparisonValue.data != null}
-              {getFormattedDiff($comparisonValue.data)}
-            {:else}
-              <span class="ui-copy-disabled-faint italic" style:font-size=".9em"
-                >no change</span
-              >
-            {/if}
-          </div>
-          {#if comparisonPercChange != null && !measureIsPercentage}
+{#if $schema.isValid}
+  {#if measure}
+    <div
+      bind:clientWidth={containerWidth}
+      bind:clientHeight={containerHeight}
+      class="flex flex-col h-full w-full bg-white pt-4 items-center gap-y-1"
+    >
+      <div class="measure-label">{$measure?.displayName || measureName}</div>
+      <div class="measure-value">{measureValueFormatted}</div>
+      <div class="flex items-center">
+        {#if $comparisonValue.data}
+          <div class="flex items-baseline gap-x-3 text-sm">
             <div
               role="complementary"
-              class="w-fit font-semibold ui-copy-inactive"
-              class:text-red-500={$measureValue.data && $measureValue.data < 0}
+              class="w-fit max-w-full overflow-hidden text-ellipsis text-gray-500"
+              class:font-semibold={$measureValue.data &&
+                $measureValue.data >= 0}
             >
-              <PercentageChange
-                color="text-gray-500"
-                showPosSign
-                tabularNumber={false}
-                value={formatMeasurePercentageDifference(comparisonPercChange)}
-              />
+              {#if $comparisonValue.data != null}
+                {getFormattedDiff($comparisonValue.data)}
+              {:else}
+                <span
+                  class="ui-copy-disabled-faint italic"
+                  style:font-size=".9em">no change</span
+                >
+              {/if}
             </div>
-          {/if}
-          {#if comparisonTimeRange}
-            <span class="comparison-range">
-              vs last {humaniseISODuration(
-                comparisonTimeRange?.toUpperCase(),
-                false,
-              )}
-            </span>
-          {/if}
-        </div>
+            {#if comparisonPercChange != null && !measureIsPercentage}
+              <div
+                role="complementary"
+                class="w-fit font-semibold ui-copy-inactive"
+                class:text-red-500={$measureValue.data &&
+                  $measureValue.data < 0}
+              >
+                <PercentageChange
+                  color="text-gray-500"
+                  showPosSign
+                  tabularNumber={false}
+                  value={formatMeasurePercentageDifference(
+                    comparisonPercChange,
+                  )}
+                />
+              </div>
+            {/if}
+            {#if comparisonTimeRange}
+              <span class="comparison-range">
+                vs last {humaniseISODuration(
+                  comparisonTimeRange?.toUpperCase(),
+                  false,
+                )}
+              </span>
+            {/if}
+          </div>
+        {/if}
+      </div>
+
+      {#if containerHeight && containerWidth && showSparkline && sparkData.length && !isEmptySparkline}
+        <SimpleDataGraphic
+          height={sparklineHeight}
+          width={containerWidth + 10}
+          overflowHidden={false}
+          top={5}
+          bottom={0}
+          right={0}
+          left={0}
+          {xMin}
+          {xMax}
+          {yMin}
+          {yMax}
+        >
+          <ChunkedLine
+            lineOpacity={0.6}
+            stopOpacity={0.2}
+            lineColor={MainLineColor}
+            areaGradientColors={focusedAreaGradient}
+            data={sparkData}
+            xAccessor="ts"
+            yAccessor={measureName}
+          />
+        </SimpleDataGraphic>
       {/if}
     </div>
-
-    {#if containerHeight && containerWidth && showSparkline && sparkData.length && !isEmptySparkline}
-      <SimpleDataGraphic
-        height={sparklineHeight}
-        width={containerWidth + 10}
-        overflowHidden={false}
-        top={5}
-        bottom={0}
-        right={0}
-        left={0}
-        {xMin}
-        {xMax}
-        {yMin}
-        {yMax}
-      >
-        <ChunkedLine
-          lineOpacity={0.6}
-          stopOpacity={0.2}
-          lineColor={MainLineColor}
-          areaGradientColors={focusedAreaGradient}
-          data={sparkData}
-          xAccessor="ts"
-          yAccessor={measureName}
-        />
-      </SimpleDataGraphic>
-    {/if}
-  </div>
+  {:else}
+    <div class="flex items-center justify-center w-24">
+      <Spinner status={EntityStatus.Running} />
+    </div>
+  {/if}
 {:else}
-  <div class="flex items-center justify-center w-24">
-    <Spinner status={EntityStatus.Running} />
+  <div
+    class="flex w-full h-full p-2 text-xl bg-white items-center justify-center text-red-500"
+  >
+    {$schema.error}
   </div>
 {/if}
 
diff --git a/web-common/src/features/canvas/components/kpi/index.ts b/web-common/src/features/canvas/components/kpi/index.ts
index 7a33a8bf2da..dca6542eacd 100644
--- a/web-common/src/features/canvas/components/kpi/index.ts
+++ b/web-common/src/features/canvas/components/kpi/index.ts
@@ -22,7 +22,7 @@ export interface KPISpec
 
 export class KPIComponent extends BaseCanvasComponent<KPISpec> {
   minSize = { width: 2, height: 2 };
-  defaultSize = { width: 8, height: 4 };
+  defaultSize = { width: 6, height: 4 };
 
   constructor(
     fileArtifact: FileArtifact | undefined = undefined,
diff --git a/web-common/src/features/canvas/components/kpi/selector.ts b/web-common/src/features/canvas/components/kpi/selector.ts
index f0057509330..eb2ebe60295 100644
--- a/web-common/src/features/canvas/components/kpi/selector.ts
+++ b/web-common/src/features/canvas/components/kpi/selector.ts
@@ -1,9 +1,8 @@
+import type { KPISpec } from "@rilldata/web-common/features/canvas/components/kpi";
+import { validateMeasures } from "@rilldata/web-common/features/canvas/components/validators";
 import type { StateManagers } from "@rilldata/web-common/features/canvas/state-managers/state-managers";
-import { useMetricsViewTimeRange } from "@rilldata/web-common/features/dashboards/selectors";
-import { getDefaultTimeGrain } from "@rilldata/web-common/features/dashboards/time-controls/time-range-utils";
 import { prepareTimeSeries } from "@rilldata/web-common/features/dashboards/time-series/utils";
 import { TIME_GRAIN } from "@rilldata/web-common/lib/time/config";
-import { isoDurationToTimeRange } from "@rilldata/web-common/lib/time/ranges/iso-ranges";
 import {
   createQueryServiceMetricsViewAggregation,
   createQueryServiceMetricsViewTimeSeries,
@@ -11,87 +10,103 @@ import {
 } from "@rilldata/web-common/runtime-client";
 import type { HTTPError } from "@rilldata/web-common/runtime-client/fetchWrapper";
 import { type CreateQueryResult } from "@tanstack/svelte-query";
-import { derived } from "svelte/store";
+import { derived, type Readable } from "svelte/store";
 
 export function useKPITotals(
   ctx: StateManagers,
-  instanceId: string,
-  metricsViewName: string,
-  measure: string,
-  overrideTimeRange: string | undefined,
+  kpiSpec: KPISpec,
+  enabled: boolean,
 ): CreateQueryResult<number | null, HTTPError> {
   const { canvasEntity } = ctx;
-  const { selectedTimeRange } = canvasEntity.timeControls;
+
+  const {
+    metrics_view: metricsViewName,
+    measure,
+    time_range: componentTimeRange,
+    dimension_filters: componentFilter,
+  } = kpiSpec;
 
   const timeAndFilterStore = canvasEntity.createTimeAndFilterStore(
     metricsViewName,
     {
-      timeRangeStore: selectedTimeRange,
-      overrideTimeRange: overrideTimeRange,
+      componentTimeRange,
+      componentFilter,
     },
   );
 
-  return derived(timeAndFilterStore, ({ timeRange, where }, set) => {
-    return createQueryServiceMetricsViewAggregation(
-      instanceId,
-      metricsViewName,
-      {
-        measures: [{ name: measure }],
-        timeRange,
-        where,
-      },
-      {
-        query: {
-          enabled:
-            !!overrideTimeRange || (!!timeRange?.start && !!timeRange?.end),
-          select: (data) => {
-            return data.data?.[0]?.[measure] ?? null;
+  return derived(
+    [ctx.runtime, timeAndFilterStore],
+    ([$runtime, { timeRange, where }], set) => {
+      return createQueryServiceMetricsViewAggregation(
+        $runtime.instanceId,
+        metricsViewName,
+        {
+          measures: [{ name: measure }],
+          timeRange,
+          where,
+        },
+        {
+          query: {
+            enabled:
+              enabled &&
+              (!!componentTimeRange ||
+                (!!timeRange?.start && !!timeRange?.end)),
+            select: (data) => {
+              return data.data?.[0]?.[measure] ?? null;
+            },
+            queryClient: ctx.queryClient,
           },
-          queryClient: ctx.queryClient,
         },
-      },
-    ).subscribe(set);
-  });
+      ).subscribe(set);
+    },
+  );
 }
 
 export function useKPIComparisonTotal(
   ctx: StateManagers,
-  instanceId: string,
-  metricsViewName: string,
-  measure: string,
-  overrideComparisonRange: string | undefined,
+  kpiSpec: KPISpec,
+  enabled: boolean,
 ): CreateQueryResult<number | null, HTTPError> {
   const { canvasEntity } = ctx;
-  const { showTimeComparison, selectedComparisonTimeRange } =
-    canvasEntity.timeControls;
+  const { showTimeComparison } = canvasEntity.timeControls;
+
+  const {
+    metrics_view: metricsViewName,
+    measure,
+    comparison_range: componentComparisonRange,
+    dimension_filters: componentFilter,
+  } = kpiSpec;
 
   // Build the store that yields { finalTimeRange, where }
   const timeAndFilterStore = canvasEntity.createTimeAndFilterStore(
     metricsViewName,
     {
-      timeRangeStore: selectedComparisonTimeRange,
-      overrideTimeRange: overrideComparisonRange,
+      componentComparisonRange,
+      componentFilter,
     },
   );
 
   return derived(
-    [timeAndFilterStore, showTimeComparison],
-    ([{ timeRange, where }, showComparison], set) => {
+    [ctx.runtime, timeAndFilterStore, showTimeComparison],
+    ([$runtime, { comparisonRange, where }, showComparison], set) => {
       // TODO: Use all time range and then calculate the comparison range
 
       return createQueryServiceMetricsViewAggregation(
-        instanceId,
+        $runtime.instanceId,
         metricsViewName,
         {
           measures: [{ name: measure }],
-          timeRange,
+          timeRange: comparisonRange,
           where,
         },
         {
           query: {
             enabled:
-              !!overrideComparisonRange ||
-              (showComparison && !!timeRange?.start && !!timeRange?.end),
+              enabled &&
+              (!!componentComparisonRange ||
+                (showComparison &&
+                  !!comparisonRange?.start &&
+                  !!comparisonRange?.end)),
             select: (data) => {
               return data.data?.[0]?.[measure] ?? null;
             },
@@ -105,54 +120,37 @@ export function useKPIComparisonTotal(
 
 export function useKPISparkline(
   ctx: StateManagers,
-  instanceId: string,
-  metricsViewName: string,
-  measure: string,
-  overrideTimeRange: string | undefined,
+  kpiSpec: KPISpec,
+  enabled: boolean,
 ): CreateQueryResult<Array<Record<string, unknown>>> {
-  const allTimeRangeQuery = useMetricsViewTimeRange(
-    instanceId,
-    metricsViewName,
-    { query: { queryClient: ctx.queryClient } },
-  );
-  const { canvasEntity } = ctx;
-  const { selectedTimeRange } = canvasEntity.timeControls;
+  const {
+    canvasEntity: { createTimeAndFilterStore },
+  } = ctx;
 
-  const timeAndFilterStore = canvasEntity.createTimeAndFilterStore(
-    metricsViewName,
-    {
-      timeRangeStore: selectedTimeRange,
-      overrideTimeRange: overrideTimeRange,
-    },
-  );
+  const {
+    metrics_view: metricsViewName,
+    measure,
+    // TODO: Override time range for sparkline when we integrate
+    // time range panel with super pill and in turn can get
+    // start and end time from the super pill instead of ISO
+
+    // time_range: componentTimeRange,
+    dimension_filters: componentFilter,
+  } = kpiSpec;
+
+  const timeAndFilterStore = createTimeAndFilterStore(metricsViewName, {
+    componentFilter,
+  });
 
   return derived(
-    [allTimeRangeQuery, selectedTimeRange, timeAndFilterStore],
-    ([allTimeRange, selectedRange, { timeRange, where }], set) => {
-      const maxTime = allTimeRange?.data?.timeRangeSummary?.max;
-      const maxTimeDate = new Date(maxTime ?? 0);
-
-      let { start, end } = timeRange;
-      const { timeZone } = timeRange;
-
-      let defaultGrain = selectedRange?.interval || V1TimeGrain.TIME_GRAIN_DAY;
-
-      if (overrideTimeRange) {
-        const overrideRange = isoDurationToTimeRange(
-          overrideTimeRange,
-          maxTimeDate,
-        );
-
-        defaultGrain = getDefaultTimeGrain(
-          overrideRange.startTime,
-          overrideRange.endTime,
-        );
-        start = overrideRange.startTime.toISOString();
-        end = overrideRange.endTime.toISOString();
-      }
+    [ctx.runtime, timeAndFilterStore],
+    ([$runtime, { timeRange, where, timeGrain }], set) => {
+      const { start, end, timeZone } = timeRange;
+
+      const defaultGrain = timeGrain || V1TimeGrain.TIME_GRAIN_HOUR;
 
       return createQueryServiceMetricsViewTimeSeries(
-        instanceId,
+        $runtime.instanceId,
         metricsViewName,
         {
           measureNames: [measure],
@@ -164,7 +162,7 @@ export function useKPISparkline(
         },
         {
           query: {
-            enabled: !!start && !!end && !!maxTime,
+            enabled: !!start && !!end && enabled,
             select: (data) => {
               return prepareTimeSeries(
                 data.data || [],
@@ -180,3 +178,37 @@ export function useKPISparkline(
     },
   );
 }
+
+export function validateKPISchema(
+  ctx: StateManagers,
+  kpiSpec: KPISpec,
+): Readable<{
+  isValid: boolean;
+  error?: string;
+}> {
+  const { metrics_view } = kpiSpec;
+  return derived(
+    ctx.canvasEntity.spec.getMetricsViewFromName(metrics_view),
+    (metricsView) => {
+      const measure = kpiSpec.measure;
+      if (!metricsView) {
+        return {
+          isValid: false,
+          error: `Metrics view ${metrics_view} not found`,
+        };
+      }
+      const validateMeasuresRes = validateMeasures(metricsView, [measure]);
+      if (!validateMeasuresRes.isValid) {
+        const invalidMeasures = validateMeasuresRes.invalidMeasures.join(", ");
+        return {
+          isValid: false,
+          error: `Invalid measure "${invalidMeasures}" selected`,
+        };
+      }
+      return {
+        isValid: true,
+        error: undefined,
+      };
+    },
+  );
+}
diff --git a/web-common/src/features/canvas/components/markdown/Markdown.svelte b/web-common/src/features/canvas/components/markdown/Markdown.svelte
index 500e17d006c..ca3069aed2e 100644
--- a/web-common/src/features/canvas/components/markdown/Markdown.svelte
+++ b/web-common/src/features/canvas/components/markdown/Markdown.svelte
@@ -1,23 +1,17 @@
 <script lang="ts">
-  import type { MarkdownProperties } from "@rilldata/web-common/features/templates/types";
   import type { V1ComponentSpecRendererProperties } from "@rilldata/web-common/runtime-client";
   import DOMPurify from "dompurify";
   import { marked } from "marked";
+  import type { MarkdownSpec } from "./";
+  import { getPositionClasses } from "./util";
 
   export let rendererProperties: V1ComponentSpecRendererProperties;
+  $: markdownProperties = rendererProperties as MarkdownSpec;
 
-  $: markdownProperties = rendererProperties as MarkdownProperties;
-  $: css = markdownProperties.css || {};
-
-  $: styleString = Object.entries(css)
-    .map(([k, v]) => `${k}:${v}`)
-    .join(";");
+  $: positionClasses = getPositionClasses(markdownProperties.alignment);
 </script>
 
-<div
-  class="markdown size-full p-2 flex flex-col justify-center bg-white"
-  style={styleString}
->
+<div class="{positionClasses} markdown size-full p-2 flex flex-col bg-white">
   {#await marked(markdownProperties.content) then content}
     {@html DOMPurify.sanitize(content)}
   {/await}
diff --git a/web-common/src/features/canvas/components/markdown/index.ts b/web-common/src/features/canvas/components/markdown/index.ts
index a778b405b4c..3e2926e02cb 100644
--- a/web-common/src/features/canvas/components/markdown/index.ts
+++ b/web-common/src/features/canvas/components/markdown/index.ts
@@ -1,17 +1,26 @@
 import { BaseCanvasComponent } from "@rilldata/web-common/features/canvas/components/BaseCanvasComponent";
 import type { InputParams } from "@rilldata/web-common/features/canvas/inspector/types";
 import type { FileArtifact } from "@rilldata/web-common/features/entity-management/file-artifact";
-import { type ComponentCommonProperties } from "../types";
+import {
+  type ComponentAlignment,
+  type ComponentCommonProperties,
+} from "../types";
 
 export { default as Markdown } from "./Markdown.svelte";
 
+export const defaultAlignment: ComponentAlignment = {
+  vertical: "middle",
+  horizontal: "left",
+};
+
 export interface MarkdownSpec extends ComponentCommonProperties {
   content: string;
+  alignment?: ComponentAlignment;
 }
 
 export class MarkdownCanvasComponent extends BaseCanvasComponent<MarkdownSpec> {
   minSize = { width: 1, height: 1 };
-  defaultSize = { width: 6, height: 2 };
+  defaultSize = { width: 3, height: 2 };
 
   constructor(
     fileArtifact: FileArtifact | undefined = undefined,
@@ -22,6 +31,7 @@ export class MarkdownCanvasComponent extends BaseCanvasComponent<MarkdownSpec> {
       title: "",
       description: "",
       content: "Your text",
+      alignment: defaultAlignment,
     };
     super(fileArtifact, path, defaultSpec, initialSpec);
   }
@@ -33,7 +43,12 @@ export class MarkdownCanvasComponent extends BaseCanvasComponent<MarkdownSpec> {
   inputParams(): InputParams<MarkdownSpec> {
     return {
       options: {
-        content: { type: "textArea" },
+        content: {
+          type: "textArea",
+          label: "Markdown",
+          description: "Write text using the markdown syntax",
+        },
+        alignment: { type: "alignment", label: "Alignment" },
       },
       filter: {},
     };
@@ -42,6 +57,7 @@ export class MarkdownCanvasComponent extends BaseCanvasComponent<MarkdownSpec> {
   newComponentSpec(): MarkdownSpec {
     return {
       content: "Markdown Text",
+      alignment: defaultAlignment,
     };
   }
 }
diff --git a/web-common/src/features/canvas/components/markdown/util.ts b/web-common/src/features/canvas/components/markdown/util.ts
new file mode 100644
index 00000000000..217e11bf33b
--- /dev/null
+++ b/web-common/src/features/canvas/components/markdown/util.ts
@@ -0,0 +1,31 @@
+import { defaultAlignment } from "@rilldata/web-common/features/canvas/components/markdown";
+import type { ComponentAlignment } from "@rilldata/web-common/features/canvas/components/types";
+
+export function getPositionClasses(alignment: ComponentAlignment | undefined) {
+  if (!alignment) alignment = defaultAlignment;
+  let classString = "";
+
+  switch (alignment.horizontal) {
+    case "left":
+      classString = "items-start";
+      break;
+    case "center":
+      classString = "items-center";
+      break;
+    case "right":
+      classString = "items-end";
+  }
+
+  switch (alignment.vertical) {
+    case "top":
+      classString += " justify-start";
+      break;
+    case "middle":
+      classString += " justify-center";
+      break;
+    case "bottom":
+      classString += " justify-end";
+  }
+
+  return classString;
+}
diff --git a/web-common/src/features/canvas/components/table/TableTemplate.svelte b/web-common/src/features/canvas/components/table/TableTemplate.svelte
index 92273aac1e9..e180df579ff 100644
--- a/web-common/src/features/canvas/components/table/TableTemplate.svelte
+++ b/web-common/src/features/canvas/components/table/TableTemplate.svelte
@@ -1,41 +1,35 @@
 <script lang="ts">
+  import type { TableSpec } from "@rilldata/web-common/features/canvas/components/table";
+  import { getCanvasStateManagers } from "@rilldata/web-common/features/canvas/state-managers/state-managers";
   import { createPivotDataStore } from "@rilldata/web-common/features/dashboards/pivot/pivot-data-store";
   import {
     PivotChipType,
+    type PivotDashboardContext,
     type PivotDataStore,
     type PivotDataStoreConfig,
     type PivotState,
   } from "@rilldata/web-common/features/dashboards/pivot/types";
-  import { createStateManagers } from "@rilldata/web-common/features/dashboards/state-managers/state-managers";
-  import type { TableProperties } from "@rilldata/web-common/features/templates/types";
   import type { V1ComponentSpecRendererProperties } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-  import { useQueryClient } from "@tanstack/svelte-query";
-  import { type Readable, writable } from "svelte/store";
-  import { getTableConfig, hasValidTableSchema } from "./selector";
+  import { readable, type Readable, writable } from "svelte/store";
+  import { getTableConfig, validateTableSchema } from "./selector";
   import TableRenderer from "./TableRenderer.svelte";
 
   export let rendererProperties: V1ComponentSpecRendererProperties;
 
-  const queryClient = useQueryClient();
-  const TABLE_PREFIX = "_custom-table";
+  const ctx = getCanvasStateManagers();
 
-  $: ({ instanceId } = $runtime);
+  $: tableSpec = rendererProperties as TableSpec;
 
-  $: tableProperties = rendererProperties as TableProperties;
+  $: colDimensions = tableSpec.col_dimensions || [];
+  $: rowDimensions = tableSpec.row_dimensions || [];
 
-  $: tableSchema = hasValidTableSchema(instanceId, tableProperties);
-
-  $: isValidSchema = $tableSchema.isValid;
-
-  $: colDimensions = tableProperties.col_dimensions || [];
-  $: rowDimensions = tableProperties.row_dimensions || [];
-  $: whereSql = tableProperties.filter;
+  $: schema = validateTableSchema(ctx, tableSpec);
 
+  // TODO: Should we move this to canvas entity store?
   $: pivotState = writable<PivotState>({
     active: true,
     columns: {
-      measure: tableProperties.measures.map((measure) => ({
+      measure: tableSpec.measures.map((measure) => ({
         id: measure,
         title: measure,
         type: PivotChipType.Measure,
@@ -53,7 +47,6 @@
         type: PivotChipType.Dimension,
       })),
     },
-    whereSql,
     expanded: {},
     sorting: [],
     columnPage: 1,
@@ -65,22 +58,26 @@
 
   let pivotDataStore: PivotDataStore | undefined = undefined;
   let pivotConfig: Readable<PivotDataStoreConfig> | undefined = undefined;
-  $: if (isValidSchema) {
-    const stateManagerContext = createStateManagers({
-      queryClient,
-      exploreName: "TODO", // Historically, State Managers have only been used for Explore, not Canvas.
-      metricsViewName: tableProperties.metrics_view,
-      extraKeyPrefix: TABLE_PREFIX,
-    });
 
-    pivotConfig = getTableConfig(instanceId, tableProperties, $pivotState);
-    pivotDataStore = createPivotDataStore(stateManagerContext, pivotConfig);
+  // TODO: Consider moving to a memoized store
+  $: if ($schema.isValid) {
+    const pivotDashboardContext: PivotDashboardContext = {
+      metricsViewName: readable(tableSpec.metrics_view),
+      queryClient: ctx.queryClient,
+      enabled: !!ctx.canvasEntity.spec.canvasSpec,
+    };
+    pivotConfig = getTableConfig(ctx, tableSpec, $pivotState);
+    pivotDataStore = createPivotDataStore(pivotDashboardContext, pivotConfig);
   }
 </script>
 
-<div class="overflow-y-auto">
-  {#if !isValidSchema}
-    <div>{$tableSchema.error}</div>
+<div class="overflow-y-auto h-full">
+  {#if !$schema.isValid}
+    <div
+      class="flex w-full h-full p-2 text-xl bg-white items-center justify-center text-red-500"
+    >
+      {$schema.error}
+    </div>
   {:else if pivotDataStore && pivotConfig && $pivotConfig}
     <TableRenderer
       {pivotDataStore}
diff --git a/web-common/src/features/canvas/components/table/index.ts b/web-common/src/features/canvas/components/table/index.ts
index 0fd10345ab2..36ff528f259 100644
--- a/web-common/src/features/canvas/components/table/index.ts
+++ b/web-common/src/features/canvas/components/table/index.ts
@@ -23,7 +23,7 @@ export interface TableSpec
 
 export class TableCanvasComponent extends BaseCanvasComponent<TableSpec> {
   minSize = { width: 2, height: 2 };
-  defaultSize = { width: 16, height: 10 };
+  defaultSize = { width: 4, height: 10 };
 
   constructor(
     fileArtifact: FileArtifact | undefined = undefined,
diff --git a/web-common/src/features/canvas/components/table/selector.ts b/web-common/src/features/canvas/components/table/selector.ts
index d82d8ef3788..01dcfd21900 100644
--- a/web-common/src/features/canvas/components/table/selector.ts
+++ b/web-common/src/features/canvas/components/table/selector.ts
@@ -1,3 +1,9 @@
+import type { TableSpec } from "@rilldata/web-common/features/canvas/components/table";
+import {
+  validateDimensions,
+  validateMeasures,
+} from "@rilldata/web-common/features/canvas/components/validators";
+import type { StateManagers } from "@rilldata/web-common/features/canvas/state-managers/state-managers";
 import { canEnablePivotComparison } from "@rilldata/web-common/features/dashboards/pivot/pivot-utils";
 import {
   COMPARISON_DELTA,
@@ -5,97 +11,39 @@ import {
   type PivotDataStoreConfig,
   type PivotState,
 } from "@rilldata/web-common/features/dashboards/pivot/types";
-import {
-  useMetricsViewTimeRange,
-  useMetricsViewValidSpec,
-} from "@rilldata/web-common/features/dashboards/selectors";
 import { createAndExpression } from "@rilldata/web-common/features/dashboards/stores/filter-utils";
-import type { TableProperties } from "@rilldata/web-common/features/templates/types";
-import {
-  validateDimensions,
-  validateMeasures,
-  validateMetricsView,
-} from "@rilldata/web-common/features/templates/utils";
-import { isoDurationToTimeRange } from "@rilldata/web-common/lib/time/ranges/iso-ranges";
-import { createQueryServiceMetricsViewTimeRange } from "@rilldata/web-common/runtime-client";
 import { type Readable, derived } from "svelte/store";
 
-export function useComparisonStartEndTime(
-  instanceId: string,
-  metricsViewName: string,
-  timeRange: string,
-  comparisonRange: string | undefined,
-) {
-  const allTimeRangeQuery = useMetricsViewTimeRange(
-    instanceId,
-    metricsViewName,
-  );
-  return derived(allTimeRangeQuery, (allTimeRange) => {
-    const maxTime = allTimeRange?.data?.timeRangeSummary?.max;
-    const maxTimeDate = new Date(maxTime ?? 0);
-    const { startTime } = isoDurationToTimeRange(timeRange, maxTimeDate);
-
-    let comparisonStartTime: Date | undefined = undefined;
-    let comparisonEndTime: Date | undefined = undefined;
-
-    if (comparisonRange) {
-      ({ startTime: comparisonStartTime, endTime: comparisonEndTime } =
-        isoDurationToTimeRange(comparisonRange, startTime));
-    }
-    return { start: comparisonStartTime, end: comparisonEndTime };
-  });
-}
-
-export function useStartEndTime(
-  instanceId: string,
-  metricsViewName: string,
-  timeRange: string,
-) {
-  return createQueryServiceMetricsViewTimeRange(
-    instanceId,
-    metricsViewName,
-    {},
-    {
-      query: {
-        select: (data) => {
-          const maxTime = new Date(data?.timeRangeSummary?.max ?? 0);
-          const { startTime, endTime } = isoDurationToTimeRange(
-            timeRange,
-            maxTime,
-          );
-
-          return { start: startTime, end: endTime };
-        },
-      },
-    },
-  );
-}
-
 export function getTableConfig(
-  instanceId: string,
-  tableProperties: TableProperties,
+  ctx: StateManagers,
+  tableSpec: TableSpec,
   pivotState: PivotState,
 ): Readable<PivotDataStoreConfig> {
-  const { metrics_view, time_range, comparison_range } = tableProperties;
+  const { metrics_view, time_range, comparison_range, dimension_filters } =
+    tableSpec;
+  const {
+    canvasEntity: {
+      createTimeAndFilterStore,
+      spec: { getMetricsViewFromName },
+    },
+  } = ctx;
+
+  const timeAndFilterStore = createTimeAndFilterStore(metrics_view, {
+    componentTimeRange: time_range,
+    componentComparisonRange: comparison_range,
+    componentFilter: dimension_filters,
+  });
+
   return derived(
-    [
-      useMetricsViewValidSpec(instanceId, tableProperties.metrics_view),
-      useStartEndTime(instanceId, metrics_view, time_range.toUpperCase()),
-      useComparisonStartEndTime(
-        instanceId,
-        metrics_view,
-        time_range.toUpperCase(),
-        comparison_range,
-      ),
-    ],
-    ([metricsView, timeRange, comparisonRange]) => {
+    [getMetricsViewFromName(metrics_view), timeAndFilterStore],
+    ([metricsView, { timeRange, comparisonRange, where }]) => {
       const enableComparison = canEnablePivotComparison(
         pivotState,
         comparisonRange.start,
       );
 
       const config: PivotDataStoreConfig = {
-        measureNames: tableProperties.measures.flatMap((name) => {
+        measureNames: tableSpec.measures.flatMap((name) => {
           const group = [name];
           if (enableComparison) {
             group.push(
@@ -105,23 +53,23 @@ export function getTableConfig(
           }
           return group;
         }),
-        rowDimensionNames: tableProperties.row_dimensions || [],
-        colDimensionNames: tableProperties.col_dimensions || [],
-        allMeasures: metricsView.data?.measures || [],
-        allDimensions: metricsView.data?.dimensions || [],
-        whereFilter: createAndExpression([]),
+        rowDimensionNames: tableSpec.row_dimensions || [],
+        colDimensionNames: tableSpec.col_dimensions || [],
+        allMeasures: metricsView?.measures || [],
+        allDimensions: metricsView?.dimensions || [],
+        whereFilter: where ?? createAndExpression([]),
         searchText: "",
         pivot: pivotState,
         enableComparison,
         comparisonTime: {
-          start: comparisonRange?.start?.toISOString() || undefined,
-          end: comparisonRange?.end?.toISOString() || undefined,
+          start: comparisonRange?.start,
+          end: comparisonRange?.end,
         },
         time: {
-          timeStart: timeRange?.data?.start?.toISOString() || undefined,
-          timeEnd: timeRange?.data?.end?.toISOString() || undefined,
-          timeZone: "UTC",
-          timeDimension: metricsView?.data?.timeDimension || "",
+          timeStart: timeRange?.start,
+          timeEnd: timeRange?.end,
+          timeZone: timeRange.timeZone || "UTC",
+          timeDimension: metricsView?.timeDimension || "",
         },
       };
 
@@ -130,23 +78,25 @@ export function getTableConfig(
   );
 }
 
-export function hasValidTableSchema(
-  instanceId: string,
-  tableProperties: TableProperties,
-) {
+export function validateTableSchema(
+  ctx: StateManagers,
+  tableSpec: TableSpec,
+): Readable<{
+  isValid: boolean;
+  error?: string;
+}> {
+  const { metrics_view } = tableSpec;
   return derived(
-    [useMetricsViewValidSpec(instanceId, tableProperties.metrics_view)],
-    ([metricsView]) => {
-      const measures = tableProperties.measures;
-      const rowDimensions = tableProperties.row_dimensions || [];
-      const colDimensions = tableProperties.col_dimensions || [];
-
-      const validateMetricsViewRes = validateMetricsView(metricsView);
+    ctx.canvasEntity.spec.getMetricsViewFromName(metrics_view),
+    (metricsView) => {
+      const measures = tableSpec.measures;
+      const rowDimensions = tableSpec.row_dimensions || [];
+      const colDimensions = tableSpec.col_dimensions || [];
 
-      if (!validateMetricsViewRes.isValid) {
+      if (!metricsView) {
         return {
           isValid: false,
-          error: validateMetricsViewRes.error,
+          error: `Metrics view ${metrics_view} not found`,
         };
       }
       const validateMeasuresRes = validateMeasures(metricsView, measures);
diff --git a/web-common/src/features/canvas/components/types.ts b/web-common/src/features/canvas/components/types.ts
index 7ed9a2422c1..56430169cd7 100644
--- a/web-common/src/features/canvas/components/types.ts
+++ b/web-common/src/features/canvas/components/types.ts
@@ -17,6 +17,13 @@ export interface ComponentCommonProperties {
   description?: string;
 }
 
+export type VeriticalAlignment = "top" | "middle" | "bottom";
+export type HoritzontalAlignment = "left" | "center" | "right";
+export interface ComponentAlignment {
+  vertical: VeriticalAlignment;
+  horizontal: HoritzontalAlignment;
+}
+
 export interface ComponentFilterProperties {
   time_range?: string;
   comparison_range?: string;
diff --git a/web-common/src/features/canvas/components/util.ts b/web-common/src/features/canvas/components/util.ts
index 8c5ea0bac48..d225fcca911 100644
--- a/web-common/src/features/canvas/components/util.ts
+++ b/web-common/src/features/canvas/components/util.ts
@@ -39,7 +39,7 @@ export function getFilterOptions(
       : {}),
     dimension_filters: {
       type: "dimension_filters",
-      label: "Dimension Filters",
+      label: "Filters",
     },
   };
 }
diff --git a/web-common/src/features/canvas/components/validators.ts b/web-common/src/features/canvas/components/validators.ts
new file mode 100644
index 00000000000..d59f6d607ee
--- /dev/null
+++ b/web-common/src/features/canvas/components/validators.ts
@@ -0,0 +1,45 @@
+import type { V1MetricsViewSpec } from "@rilldata/web-common/runtime-client";
+
+export const isMeasureValid = (
+  metricsViewSpec: V1MetricsViewSpec,
+  measureName: string,
+): boolean => {
+  return (
+    metricsViewSpec?.measures?.some((m) => m.name === measureName) || false
+  );
+};
+
+export const isDimensionValid = (
+  metricsViewSpec: V1MetricsViewSpec,
+  dimensionName: string,
+): boolean => {
+  return (
+    metricsViewSpec?.dimensions?.some((d) => d.name === dimensionName) || false
+  );
+};
+
+export const validateMeasures = (
+  metricsSpecQueryResult: V1MetricsViewSpec,
+  measureNames: string[],
+): { isValid: boolean; invalidMeasures: string[] } => {
+  const invalidMeasures = measureNames.filter(
+    (m) => !isMeasureValid(metricsSpecQueryResult, m),
+  );
+  return {
+    isValid: invalidMeasures.length === 0,
+    invalidMeasures,
+  };
+};
+
+export const validateDimensions = (
+  metricsSpecQueryResult: V1MetricsViewSpec,
+  dimensionNames: string[],
+): { isValid: boolean; invalidDimensions: string[] } => {
+  const invalidDimensions = dimensionNames.filter(
+    (d) => !isDimensionValid(metricsSpecQueryResult, d),
+  );
+  return {
+    isValid: invalidDimensions.length === 0,
+    invalidDimensions,
+  };
+};
diff --git a/web-common/src/features/canvas/constants.ts b/web-common/src/features/canvas/constants.ts
index 45db52c590b..8ff0ac663eb 100644
--- a/web-common/src/features/canvas/constants.ts
+++ b/web-common/src/features/canvas/constants.ts
@@ -1,9 +1,12 @@
 // Deperecate this when we move to new layout engine
-export const DASHBOARD_WIDTH = 1200;
+export const DEFAULT_DASHBOARD_WIDTH = 1200;
 export const COMPONENT_RADIUS = 0.08;
-export const FONT_SIZE = 40;
 export const COMPONENT_WIDTH = 1;
 export const COMPONENT_HEIGHT = 1;
-export const COLUMN_COUNT = 20;
+export const DEFAULT_COLUMN_COUNT = 12;
 export const GAP_SIZE = 4;
-export const DEFAULT_DASHBOARD_WIDTH = 1200;
+export const MIN_ROW_HEIGHT = 50;
+export const GRID_CELL_SIZE = 50;
+export const COMPONENT_MIN_WIDTH = 2;
+export const DEFAULT_TOP_BOTTOM_GAP = 10;
+export const DEFAULT_LEFT_RIGHT_GAP = 10;
diff --git a/web-common/src/features/canvas/icons/BigNumberIcon.svelte b/web-common/src/features/canvas/icons/BigNumberIcon.svelte
new file mode 100644
index 00000000000..fed74cd0544
--- /dev/null
+++ b/web-common/src/features/canvas/icons/BigNumberIcon.svelte
@@ -0,0 +1,29 @@
+<script>
+  export let size = "16px";
+  export let color = "#374151";
+</script>
+
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width={size}
+  height={size}
+  viewBox="0 0 16 16"
+  fill="none"
+>
+  <path
+    fill-rule="evenodd"
+    clip-rule="evenodd"
+    d="M4.67748 10.3203C4.9742 10.4403 5.31116 10.5003 5.68837 10.5003C6.06716 10.5003 6.40334 10.4403 6.6969 10.3203C6.99204 10.1988 7.22404 10.0347 7.39292 9.82792C7.5618 9.61959 7.64623 9.38443 7.64623 9.12243C7.64623 8.92199 7.59731 8.73812 7.49945 8.57082C7.40318 8.40352 7.27218 8.26463 7.10646 8.15416C6.94232 8.0421 6.75924 7.97028 6.55722 7.93872V7.90084C6.82079 7.85191 7.03781 7.72881 7.20826 7.53152C7.38029 7.33266 7.46631 7.09907 7.46631 6.83076C7.46631 6.57824 7.38897 6.35333 7.2343 6.15605C7.08121 5.95876 6.87051 5.8033 6.6022 5.68967C6.33547 5.57603 6.03086 5.51921 5.68837 5.51921C5.34589 5.51921 5.04049 5.57603 4.77218 5.68967C4.50545 5.8033 4.29475 5.95876 4.14008 6.15605C3.98698 6.35333 3.91044 6.57824 3.91044 6.83076C3.91044 7.09749 3.99488 7.33029 4.16375 7.52916C4.33421 7.72802 4.5528 7.85191 4.81953 7.90084V7.93872C4.61593 7.97028 4.43127 8.0421 4.26555 8.15416C4.10141 8.26463 3.9712 8.40352 3.87493 8.57082C3.77865 8.73812 3.73051 8.92199 3.73051 9.12243C3.73051 9.38443 3.81416 9.61959 3.98146 9.82792C4.15034 10.0347 4.38234 10.1988 4.67748 10.3203ZM6.06716 9.58881C5.95826 9.64248 5.832 9.66931 5.68837 9.66931C5.54633 9.66931 5.42007 9.64169 5.30959 9.58645C5.20068 9.53121 5.11467 9.45545 5.05154 9.35917C4.98998 9.26132 4.95921 9.15084 4.95921 9.02773C4.95921 8.90147 4.99077 8.78941 5.0539 8.69156C5.11703 8.59371 5.20384 8.51716 5.31432 8.46192C5.4248 8.4051 5.54948 8.37669 5.68837 8.37669C5.82884 8.37669 5.95352 8.4051 6.06243 8.46192C6.17291 8.51716 6.25971 8.59371 6.32284 8.69156C6.38597 8.78941 6.41754 8.90147 6.41754 9.02773C6.41754 9.15084 6.38597 9.26132 6.32284 9.35917C6.26129 9.45703 6.17606 9.53357 6.06716 9.58881ZM6.01508 7.4747C5.92038 7.52521 5.81148 7.55046 5.68837 7.55046C5.56685 7.55046 5.45794 7.52521 5.36167 7.4747C5.26539 7.42262 5.18964 7.35239 5.1344 7.264C5.08073 7.17404 5.0539 7.07224 5.0539 6.95861C5.0539 6.84497 5.08073 6.74475 5.1344 6.65794C5.18806 6.57114 5.26303 6.50327 5.3593 6.45434C5.45558 6.40384 5.56527 6.37859 5.68837 6.37859C5.81306 6.37859 5.92275 6.40384 6.01745 6.45434C6.11214 6.50327 6.18632 6.57114 6.23998 6.65794C6.29522 6.74475 6.32284 6.84497 6.32284 6.95861C6.32284 7.07224 6.29522 7.17404 6.23998 7.264C6.18632 7.35397 6.11135 7.4242 6.01508 7.4747Z"
+    fill={color}
+  />
+  <path
+    d="M8.5423 9.59118V10.434H12.1313V9.48938H10.1664V9.45861L10.7464 8.92357C11.0983 8.61738 11.3698 8.3546 11.5608 8.13522C11.7533 7.91583 11.8867 7.71539 11.9609 7.53389C12.035 7.35239 12.0721 7.16931 12.0721 6.98465C12.0721 6.69424 11.9972 6.43935 11.8472 6.21997C11.6989 5.99901 11.489 5.82698 11.2175 5.70387C10.946 5.58076 10.6264 5.51921 10.2587 5.51921C9.90199 5.51921 9.5887 5.58471 9.31882 5.71571C9.05051 5.84513 8.84218 6.02979 8.69382 6.26969C8.54546 6.50958 8.47128 6.79446 8.47128 7.12433H9.5816C9.5816 6.97754 9.60922 6.85286 9.66446 6.75027C9.72128 6.64768 9.80019 6.56956 9.9012 6.5159C10.0022 6.46066 10.1198 6.43304 10.254 6.43304C10.3865 6.43304 10.5041 6.45908 10.6067 6.51116C10.7093 6.56325 10.7898 6.63743 10.8482 6.7337C10.9066 6.8284 10.9358 6.94282 10.9358 7.07698C10.9358 7.19693 10.9113 7.3082 10.8624 7.41078C10.8135 7.51179 10.7424 7.6128 10.6493 7.71381C10.5562 7.81325 10.4433 7.92294 10.3108 8.04289L8.5423 9.59118Z"
+    fill={color}
+  />
+  <path
+    fill-rule="evenodd"
+    clip-rule="evenodd"
+    d="M3.3335 1.33398C2.80306 1.33398 2.29436 1.5447 1.91928 1.91977C1.54421 2.29484 1.3335 2.80355 1.3335 3.33398V12.6673C1.3335 13.1978 1.54421 13.7065 1.91928 14.0815C2.29436 14.4566 2.80306 14.6673 3.3335 14.6673H12.6668C13.1973 14.6673 13.706 14.4566 14.081 14.0815C14.4561 13.7065 14.6668 13.1978 14.6668 12.6673V3.33398C14.6668 2.80355 14.4561 2.29484 14.081 1.91977C13.706 1.5447 13.1973 1.33398 12.6668 1.33398H3.3335ZM2.86209 2.86258C2.98712 2.73756 3.15668 2.66732 3.3335 2.66732H12.6668C12.8436 2.66732 13.0132 2.73756 13.1382 2.86258C13.2633 2.9876 13.3335 3.15717 13.3335 3.33398V12.6673C13.3335 12.8441 13.2633 13.0137 13.1382 13.1387C13.0132 13.2637 12.8436 13.334 12.6668 13.334H3.3335C3.15669 13.334 2.98712 13.2637 2.86209 13.1387C2.73707 13.0137 2.66683 12.8441 2.66683 12.6673V3.33398C2.66683 3.15717 2.73707 2.9876 2.86209 2.86258Z"
+    fill={color}
+  />
+</svg>
diff --git a/web-common/src/features/canvas/icons/ChartIcon.svelte b/web-common/src/features/canvas/icons/ChartIcon.svelte
new file mode 100644
index 00000000000..2a760c69e25
--- /dev/null
+++ b/web-common/src/features/canvas/icons/ChartIcon.svelte
@@ -0,0 +1,19 @@
+<script>
+  export let size = "16px";
+  export let color = "#374151";
+</script>
+
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width={size}
+  height={size}
+  viewBox="0 0 16 16"
+  fill="none"
+>
+  <path
+    fill-rule="evenodd"
+    clip-rule="evenodd"
+    d="M3.3335 1.33398C2.80306 1.33398 2.29436 1.5447 1.91928 1.91977C1.54421 2.29484 1.3335 2.80355 1.3335 3.33398V12.6673C1.3335 13.1978 1.54421 13.7065 1.91928 14.0815C2.29436 14.4566 2.80306 14.6673 3.3335 14.6673H12.6668C13.1973 14.6673 13.706 14.4566 14.081 14.0815C14.4561 13.7065 14.6668 13.1978 14.6668 12.6673V3.33398C14.6668 2.80355 14.4561 2.29484 14.081 1.91977C13.706 1.5447 13.1973 1.33398 12.6668 1.33398H3.3335ZM2.86209 2.86258C2.98712 2.73756 3.15668 2.66732 3.3335 2.66732H12.6668C12.8436 2.66732 13.0132 2.73756 13.1382 2.86258C13.2633 2.9876 13.3335 3.15717 13.3335 3.33398V4.66856L9.3141 8.70537L6.35525 5.74651L2.66683 9.44661V3.33398C2.66683 3.15717 2.73707 2.9876 2.86209 2.86258ZM2.66683 11.3255V12.6673C2.66683 12.8441 2.73707 13.0137 2.86209 13.1387C2.98712 13.2637 3.15669 13.334 3.3335 13.334H12.6668C12.8436 13.334 13.0132 13.2637 13.1382 13.1387C13.2633 13.0137 13.3335 12.8441 13.3335 12.6673V6.57536L9.35257 10.6294L6.31142 7.5883L2.66683 11.3255Z"
+    fill={color}
+  />
+</svg>
diff --git a/web-common/src/features/canvas/icons/ImageIcon.svelte b/web-common/src/features/canvas/icons/ImageIcon.svelte
new file mode 100644
index 00000000000..5ca778fd67e
--- /dev/null
+++ b/web-common/src/features/canvas/icons/ImageIcon.svelte
@@ -0,0 +1,19 @@
+<script>
+  export let size = "16px";
+  export let color = "#374151";
+</script>
+
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width={size}
+  height={size}
+  viewBox="0 0 16 16"
+  fill="none"
+>
+  <path
+    fill-rule="evenodd"
+    clip-rule="evenodd"
+    d="M3.3335 2.66732C2.96531 2.66732 2.66683 2.96579 2.66683 3.33398V12.6673C2.66683 13.0355 2.96531 13.334 3.3335 13.334H3.72414L9.58609 7.47204L9.58616 7.47197C9.96122 7.09702 10.4698 6.88639 11.0002 6.88639C11.5305 6.88639 12.0391 7.09702 12.4142 7.47197L12.4142 7.47204L13.3335 8.3913V3.33398C13.3335 2.96579 13.035 2.66732 12.6668 2.66732H3.3335ZM14.6668 10.0001V3.33398C14.6668 2.22941 13.7714 1.33398 12.6668 1.33398H3.3335C2.22893 1.33398 1.3335 2.22941 1.3335 3.33398V12.6673C1.3335 13.7719 2.22893 14.6673 3.3335 14.6673H3.98728C3.99587 14.6675 4.00446 14.6675 4.01304 14.6673H12.6668C13.7714 14.6673 14.6668 13.7719 14.6668 12.6673V10.0014C14.6668 10.001 14.6668 10.0006 14.6668 10.0001ZM13.3335 10.2769L11.4715 8.41492L11.4714 8.41485C11.3464 8.28991 11.1769 8.21973 11.0002 8.21973C10.8234 8.21973 10.6539 8.28991 10.5289 8.41485L10.5288 8.41492L5.60976 13.334H12.6668C13.035 13.334 13.3335 13.0355 13.3335 12.6673V10.2769ZM6.00016 5.33398C5.63197 5.33398 5.3335 5.63246 5.3335 6.00065C5.3335 6.36884 5.63197 6.66732 6.00016 6.66732C6.36835 6.66732 6.66683 6.36884 6.66683 6.00065C6.66683 5.63246 6.36835 5.33398 6.00016 5.33398ZM4.00016 6.00065C4.00016 4.89608 4.89559 4.00065 6.00016 4.00065C7.10473 4.00065 8.00016 4.89608 8.00016 6.00065C8.00016 7.10522 7.10473 8.00065 6.00016 8.00065C4.89559 8.00065 4.00016 7.10522 4.00016 6.00065Z"
+    fill={color}
+  />
+</svg>
diff --git a/web-common/src/features/canvas/icons/TableIcon.svelte b/web-common/src/features/canvas/icons/TableIcon.svelte
new file mode 100644
index 00000000000..2a4e52da5bd
--- /dev/null
+++ b/web-common/src/features/canvas/icons/TableIcon.svelte
@@ -0,0 +1,19 @@
+<script>
+  export let size = "16px";
+  export let color = "#374151";
+</script>
+
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width={size}
+  height={size}
+  viewBox="0 0 16 16"
+  fill="none"
+>
+  <path
+    fill-rule="evenodd"
+    clip-rule="evenodd"
+    d="M1.91928 1.91977C2.29436 1.5447 2.80306 1.33398 3.3335 1.33398H12.6668C13.1973 1.33398 13.706 1.5447 14.081 1.91977C14.4561 2.29484 14.6668 2.80355 14.6668 3.33398V12.6673C14.6668 13.1978 14.4561 13.7065 14.081 14.0815C13.706 14.4566 13.1973 14.6673 12.6668 14.6673H3.3335C2.80306 14.6673 2.29436 14.4566 1.91928 14.0815C1.54421 13.7065 1.3335 13.1978 1.3335 12.6673V3.33398C1.3335 2.80355 1.54421 2.29484 1.91928 1.91977ZM3.3335 2.66732C3.15669 2.66732 2.98712 2.73756 2.86209 2.86258C2.73707 2.9876 2.66683 3.15717 2.66683 3.33398V5.33398H5.3335V2.66732H3.3335ZM6.66683 2.66732V5.33398H13.3335V3.33398C13.3335 3.15717 13.2633 2.9876 13.1382 2.86258C13.0132 2.73756 12.8436 2.66732 12.6668 2.66732H6.66683ZM13.3335 6.66732H6.66683V13.334H12.6668C12.8436 13.334 13.0132 13.2637 13.1382 13.1387C13.2633 13.0137 13.3335 12.8441 13.3335 12.6673V6.66732ZM5.3335 13.334V6.66732H2.66683V12.6673C2.66683 12.8441 2.73707 13.0137 2.86209 13.1387C2.98712 13.2637 3.15669 13.334 3.3335 13.334H5.3335Z"
+    fill={color}
+  />
+</svg>
diff --git a/web-common/src/features/canvas/icons/TextIcon.svelte b/web-common/src/features/canvas/icons/TextIcon.svelte
new file mode 100644
index 00000000000..616b22bbe49
--- /dev/null
+++ b/web-common/src/features/canvas/icons/TextIcon.svelte
@@ -0,0 +1,19 @@
+<script>
+  export let size = "16px";
+  export let color = "#374151";
+</script>
+
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width={size}
+  height={size}
+  viewBox="0 0 16 16"
+  fill="none"
+>
+  <path
+    fill-rule="evenodd"
+    clip-rule="evenodd"
+    d="M3.3335 1.33398C2.80306 1.33398 2.29436 1.5447 1.91928 1.91977C1.54421 2.29484 1.3335 2.80355 1.3335 3.33398V12.6673C1.3335 13.1978 1.54421 13.7065 1.91928 14.0815C2.29436 14.4566 2.80306 14.6673 3.3335 14.6673H12.6668C13.1973 14.6673 13.706 14.4566 14.081 14.0815C14.4561 13.7065 14.6668 13.1978 14.6668 12.6673V3.33398C14.6668 2.80355 14.4561 2.29484 14.081 1.91977C13.706 1.5447 13.1973 1.33398 12.6668 1.33398H3.3335ZM2.86209 2.86258C2.98712 2.73756 3.15668 2.66732 3.3335 2.66732H12.6668C12.8436 2.66732 13.0132 2.73756 13.1382 2.86258C13.2633 2.9876 13.3335 3.15717 13.3335 3.33398V12.6673C13.3335 12.8441 13.2633 13.0137 13.1382 13.1387C13.0132 13.2637 12.8436 13.334 12.6668 13.334H3.3335C3.15669 13.334 2.98712 13.2637 2.86209 13.1387C2.73707 13.0137 2.66683 12.8441 2.66683 12.6673V3.33398C2.66683 3.15717 2.73707 2.9876 2.86209 2.86258ZM4.3335 4.66712C4.3335 4.37257 4.57228 4.13379 4.86683 4.13379H11.0984C11.393 4.13379 11.6318 4.37257 11.6318 4.66712L11.6318 4.67055V6.00046C11.6318 6.29501 11.393 6.53379 11.0984 6.53379C10.8039 6.53379 10.5651 6.29501 10.5651 6.00046V5.20046H8.64922V10.8005H9.34925C9.6438 10.8005 9.88259 11.0392 9.88259 11.3338C9.88259 11.6283 9.6438 11.8671 9.34925 11.8671H6.62292C6.32837 11.8671 6.08958 11.6283 6.08958 11.3338C6.08958 11.0392 6.32837 10.8005 6.62292 10.8005H7.31589V5.20046H5.40016L5.40016 6.00046C5.40016 6.29501 5.16138 6.53379 4.86683 6.53379C4.57228 6.53379 4.3335 6.29501 4.3335 6.00046V4.66712Z"
+    fill={color}
+  />
+</svg>
diff --git a/web-common/src/features/canvas/inspector/AlignmentInput.svelte b/web-common/src/features/canvas/inspector/AlignmentInput.svelte
new file mode 100644
index 00000000000..a3ce2dd35b5
--- /dev/null
+++ b/web-common/src/features/canvas/inspector/AlignmentInput.svelte
@@ -0,0 +1,81 @@
+<script lang="ts">
+  import IconSwitcher from "@rilldata/web-common/components/forms/IconSwitcher.svelte";
+  import InputLabel from "@rilldata/web-common/components/forms/InputLabel.svelte";
+  import { defaultAlignment } from "@rilldata/web-common/features/canvas/components/markdown";
+  import type {
+    ComponentAlignment,
+    HoritzontalAlignment,
+    VeriticalAlignment,
+  } from "@rilldata/web-common/features/canvas/components/types";
+  import {
+    AlignCenterHorizontal,
+    AlignCenterVertical,
+    AlignEndHorizontal,
+    AlignEndVertical,
+    AlignStartHorizontal,
+    AlignStartVertical,
+  } from "lucide-svelte";
+
+  export let key: string;
+  export let label: string;
+  export let position: ComponentAlignment | undefined;
+  export let onChange: (updatedPosition: ComponentAlignment) => void;
+
+  $: if (position === undefined) {
+    position = defaultAlignment;
+  }
+
+  const horizontalOptions = [
+    { id: "left", Icon: AlignStartVertical },
+    { id: "center", Icon: AlignCenterVertical },
+    { id: "right", Icon: AlignEndVertical },
+  ];
+
+  const verticalOptions = [
+    { id: "top", Icon: AlignStartHorizontal },
+    { id: "middle", Icon: AlignCenterHorizontal },
+    { id: "bottom", Icon: AlignEndHorizontal },
+  ];
+
+  const updatePosition = (
+    value: string,
+    direction: "horizontal" | "vertical",
+  ) => {
+    if (!position) position = defaultAlignment;
+    if (direction === "horizontal") {
+      const newOption = value as HoritzontalAlignment;
+      if (newOption === position?.horizontal) return;
+      onChange({ ...position, horizontal: newOption });
+    } else {
+      const newOption = value as VeriticalAlignment;
+      if (newOption === position?.vertical) return;
+      onChange({ ...position, vertical: newOption });
+    }
+  };
+</script>
+
+<div class="flex flex-col gap-y-2">
+  <InputLabel
+    hint="View documentation"
+    link="https://www.markdown.org"
+    small
+    {label}
+    id={key}
+  />
+
+  <IconSwitcher
+    small
+    expand
+    fields={horizontalOptions}
+    selected={position?.horizontal}
+    onClick={(option) => updatePosition(option, "horizontal")}
+  />
+
+  <IconSwitcher
+    small
+    expand
+    fields={verticalOptions}
+    selected={position?.vertical}
+    onClick={(option) => updatePosition(option, "vertical")}
+  />
+</div>
diff --git a/web-common/src/features/canvas/inspector/ComponentsEditor.svelte b/web-common/src/features/canvas/inspector/ComponentsEditor.svelte
index 68ccc68aab3..35091e30211 100644
--- a/web-common/src/features/canvas/inspector/ComponentsEditor.svelte
+++ b/web-common/src/features/canvas/inspector/ComponentsEditor.svelte
@@ -14,7 +14,7 @@
   import SidebarWrapper from "@rilldata/web-common/features/visual-editing/SidebarWrapper.svelte";
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
   import ComponentTabs from "./ComponentTabs.svelte";
-  import FiltersMapper from "./FiltersMapper.svelte";
+  import FiltersMapper from "./filters/FiltersMapper.svelte";
   import ParamMapper from "./ParamMapper.svelte";
 
   export let selectedComponentName: string;
@@ -61,7 +61,7 @@
   </svelte:fragment>
 
   {#if componentType && component && rendererProperties}
-    {#key selectedComponentIndex}
+    {#key selectedComponentName}
       {#if currentTab === "options"}
         <ParamMapper
           {component}
@@ -69,7 +69,11 @@
           paramValues={rendererProperties}
         />
       {:else if currentTab === "filters"}
-        <FiltersMapper {component} paramValues={rendererProperties} />
+        <FiltersMapper
+          {selectedComponentName}
+          {component}
+          paramValues={rendererProperties}
+        />
       {:else if currentTab === "config"}
         <VegaConfigInput {component} paramValues={rendererProperties} />
       {/if}
diff --git a/web-common/src/features/canvas/inspector/MultiFieldInput.svelte b/web-common/src/features/canvas/inspector/MultiFieldInput.svelte
index 68690178dde..fe0aa423b87 100644
--- a/web-common/src/features/canvas/inspector/MultiFieldInput.svelte
+++ b/web-common/src/features/canvas/inspector/MultiFieldInput.svelte
@@ -4,7 +4,7 @@
   import InputLabel from "@rilldata/web-common/components/forms/InputLabel.svelte";
   import Search from "@rilldata/web-common/components/search/Search.svelte";
   import { getCanvasStateManagers } from "@rilldata/web-common/features/canvas/state-managers/state-managers";
-  import { MinusIcon, PlusIcon } from "lucide-svelte";
+  import { PlusIcon } from "lucide-svelte";
   import { useMetricFieldData } from "./selectors";
 
   export let metricName: string;
@@ -85,24 +85,19 @@
   {#if selectedItems?.length > 0}
     <div class="flex flex-col gap-1 mt-2">
       {#each selectedItems as item}
-        <div class="flex items-center justify-between gap-x-2">
-          <div class="flex-1">
-            <Chip fullWidth {type}>
-              <span class="font-bold truncate" slot="body">
-                {$fieldData.displayMap[item] || item}
-              </span>
-            </Chip>
-          </div>
-          <button
-            class="px-2 py-1 text-xs"
-            on:click={() => {
-              selectedProxy.delete(item);
-              onMultiSelect(Array.from(selectedProxy));
-            }}
-          >
-            <MinusIcon size="14px" />
-          </button>
-        </div>
+        <Chip
+          removable
+          fullWidth
+          {type}
+          on:remove={() => {
+            selectedProxy.delete(item);
+            onMultiSelect(Array.from(selectedProxy));
+          }}
+        >
+          <span class="font-bold truncate" slot="body">
+            {$fieldData.displayMap[item] || item}
+          </span>
+        </Chip>
       {/each}
     </div>
   {/if}
diff --git a/web-common/src/features/canvas/inspector/PageEditor.svelte b/web-common/src/features/canvas/inspector/PageEditor.svelte
index 210cf71dc08..2812625012e 100644
--- a/web-common/src/features/canvas/inspector/PageEditor.svelte
+++ b/web-common/src/features/canvas/inspector/PageEditor.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
   import Input from "@rilldata/web-common/components/forms/Input.svelte";
   import InputLabel from "@rilldata/web-common/components/forms/InputLabel.svelte";
+  import Switch from "@rilldata/web-common/components/forms/Switch.svelte";
   import { DEFAULT_DASHBOARD_WIDTH } from "@rilldata/web-common/features/canvas/constants";
   import { getParsedDocument } from "@rilldata/web-common/features/canvas/inspector/selectors";
   import { getCanvasStateManagers } from "@rilldata/web-common/features/canvas/state-managers/state-managers";
+  import { createAndExpression } from "@rilldata/web-common/features/dashboards/stores/filter-utils";
   import ZoneDisplay from "@rilldata/web-common/features/dashboards/time-controls/super-pill/components/ZoneDisplay.svelte";
   import type { FileArtifact } from "@rilldata/web-common/features/entity-management/file-artifact";
   import {
@@ -32,8 +34,12 @@
   ) => Promise<void>;
   export let fileArtifact: FileArtifact;
 
-  const { canvasEntity } = getCanvasStateManagers();
-  const { canvasSpec } = canvasEntity.spec;
+  const {
+    canvasEntity: {
+      spec: { canvasSpec },
+      filters: { setFilters },
+    },
+  } = getCanvasStateManagers();
 
   $: ({ instanceId } = $runtime);
 
@@ -83,6 +89,7 @@
     .map((theme) => theme.meta?.name?.name ?? "")
     .filter((string) => !string.endsWith("--theme"));
 
+  $: showFilterBar = $canvasSpec?.filtersEnabled ?? true;
   $: theme = !rawTheme
     ? undefined
     : typeof rawTheme === "string"
@@ -90,6 +97,18 @@
       : rawTheme instanceof YAMLMap
         ? $canvasSpec?.embeddedTheme
         : undefined;
+
+  async function toggleFilterBar() {
+    const updatedShowFilterBar = !showFilterBar;
+
+    if (!updatedShowFilterBar) {
+      setFilters(createAndExpression([]));
+    }
+
+    await updateProperties({
+      filters: { enable: updatedShowFilterBar },
+    });
+  }
 </script>
 
 <SidebarWrapper type="secondary" disableHorizontalPadding title="Canvas">
@@ -126,57 +145,70 @@
     />
   </div>
   <div class="page-param flex flex-col gap-y-2">
-    <InputLabel id="canvas-filter" small label="Filter" />
-    <div class="flex flex-col gap-y-2">
-      <MultiSelectInput
-        small
-        label="Time ranges"
-        id="canvas-time-range"
-        defaultLabel="Default time ranges"
-        showLabel={false}
-        defaultItems={DEFAULT_RANGES}
-        keyNotSet={!rawTimeRanges}
-        selectedItems={timeRanges}
-        onSelectCustomItem={onSelectTimeRangeItem}
-        setItems={async (time_ranges) => {
-          if (time_ranges.length === 0) {
-            await updateProperties({ time_ranges }, [["time_range"]]);
-          } else {
-            await updateProperties({ time_ranges });
-          }
-        }}
-        let:item
-      >
-        {DEFAULT_TIME_RANGES[item]?.label ?? item}
-      </MultiSelectInput>
-
-      <MultiSelectInput
+    <div
+      class="flex items-center justify-between {showFilterBar ? 'pb-1' : ''}"
+    >
+      <InputLabel
+        capitalize={false}
+        id="canvas-filter"
         small
-        label="Time zones"
-        id="visual-explore-zone"
-        showLabel={false}
-        defaultLabel="Default time zones"
-        searchableItems={Intl.supportedValuesOf("timeZone")}
-        defaultItems={DEFAULT_TIMEZONES}
-        keyNotSet={!rawTimeZones}
-        selectedItems={timeZones}
-        clearKey={async () => {
-          await updateProperties({}, ["time_zones"]);
-        }}
-        onSelectCustomItem={async (item) => {
-          const deleted = timeZones.delete(item);
-          if (!deleted) timeZones.add(item);
-
-          await updateProperties({ time_zones: Array.from(timeZones) });
-        }}
-        setItems={async (time_zones) => {
-          await updateProperties({ time_zones });
-        }}
-        let:item
-      >
-        <ZoneDisplay iana={item} />
-      </MultiSelectInput>
+        label="Filter bar"
+      />
+      <Switch checked={showFilterBar} on:click={toggleFilterBar} small />
     </div>
+
+    {#if showFilterBar}
+      <div class="flex flex-col gap-y-2">
+        <MultiSelectInput
+          small
+          label="Time ranges"
+          id="canvas-time-range"
+          defaultLabel="Default time ranges"
+          showLabel={false}
+          defaultItems={DEFAULT_RANGES}
+          keyNotSet={!rawTimeRanges}
+          selectedItems={timeRanges}
+          onSelectCustomItem={onSelectTimeRangeItem}
+          setItems={async (time_ranges) => {
+            if (time_ranges.length === 0) {
+              await updateProperties({ time_ranges }, [["time_range"]]);
+            } else {
+              await updateProperties({ time_ranges });
+            }
+          }}
+          let:item
+        >
+          {DEFAULT_TIME_RANGES[item]?.label ?? item}
+        </MultiSelectInput>
+
+        <MultiSelectInput
+          small
+          label="Time zones"
+          id="visual-explore-zone"
+          showLabel={false}
+          defaultLabel="Default time zones"
+          searchableItems={Intl.supportedValuesOf("timeZone")}
+          defaultItems={DEFAULT_TIMEZONES}
+          keyNotSet={!rawTimeZones}
+          selectedItems={timeZones}
+          clearKey={async () => {
+            await updateProperties({}, ["time_zones"]);
+          }}
+          onSelectCustomItem={async (item) => {
+            const deleted = timeZones.delete(item);
+            if (!deleted) timeZones.add(item);
+
+            await updateProperties({ time_zones: Array.from(timeZones) });
+          }}
+          setItems={async (time_zones) => {
+            await updateProperties({ time_zones });
+          }}
+          let:item
+        >
+          <ZoneDisplay iana={item} />
+        </MultiSelectInput>
+      </div>
+    {/if}
   </div>
   <div class="page-param">
     <ThemeInput
diff --git a/web-common/src/features/canvas/inspector/ParamMapper.svelte b/web-common/src/features/canvas/inspector/ParamMapper.svelte
index a75022d66c0..b0139581ec5 100644
--- a/web-common/src/features/canvas/inspector/ParamMapper.svelte
+++ b/web-common/src/features/canvas/inspector/ParamMapper.svelte
@@ -6,6 +6,7 @@
     isChartComponentType,
     type CanvasComponentObj,
   } from "@rilldata/web-common/features/canvas/components/util";
+  import AlignmentInput from "@rilldata/web-common/features/canvas/inspector/AlignmentInput.svelte";
   import ChartTypeSelector from "@rilldata/web-common/features/canvas/inspector/ChartTypeSelector.svelte";
   import MarkSelector from "@rilldata/web-common/features/canvas/inspector/MarkSelector.svelte";
   import MetricSelectorDropdown from "@rilldata/web-common/features/canvas/inspector/MetricSelectorDropdown.svelte";
@@ -110,17 +111,35 @@
 
           <!-- TEXT AREA -->
         {:else if config.type === "textArea"}
-          <InputLabel small label={config.label ?? key} id={key} />
-          <textarea
-            class="w-full p-2 border border-gray-300 rounded-sm"
-            rows="4"
-            bind:value={localParamValues[key]}
-            on:blur={async () => {
-              component.updateProperty(key, localParamValues[key]);
+          <div class="flex flex-col gap-y-2">
+            <InputLabel
+              hint={config?.description}
+              small
+              label={config.label ?? key}
+              id={key}
+            />
+            <textarea
+              class="w-full p-2 border border-gray-300 rounded-sm"
+              rows="8"
+              bind:value={localParamValues[key]}
+              on:blur={async () => {
+                component.updateProperty(key, localParamValues[key]);
+              }}
+              placeholder={config.label ?? key}
+            />
+          </div>
+
+          <!-- TEXT AREA -->
+        {:else if config.type === "alignment"}
+          <AlignmentInput
+            {key}
+            label={config.label ?? key}
+            position={localParamValues[key]}
+            onChange={(updatedPosition) => {
+              localParamValues[key] = updatedPosition;
+              component.updateProperty(key, updatedPosition);
             }}
-            placeholder={config.label ?? key}
           />
-
           <!-- POSITIONAL CONFIG -->
         {:else if metricsView && config.type === "positional"}
           <PositionalFieldConfig
diff --git a/web-common/src/features/canvas/inspector/filters/DimensionFiltersInput.svelte b/web-common/src/features/canvas/inspector/filters/DimensionFiltersInput.svelte
new file mode 100644
index 00000000000..bb379842087
--- /dev/null
+++ b/web-common/src/features/canvas/inspector/filters/DimensionFiltersInput.svelte
@@ -0,0 +1,164 @@
+<script lang="ts">
+  import { Button } from "@rilldata/web-common/components/button";
+  import InputLabel from "@rilldata/web-common/components/forms/InputLabel.svelte";
+  import { getCanvasStateManagers } from "@rilldata/web-common/features/canvas/state-managers/state-managers";
+  import AdvancedFilter from "@rilldata/web-common/features/dashboards/filters/AdvancedFilter.svelte";
+  import FilterButton from "@rilldata/web-common/features/dashboards/filters/FilterButton.svelte";
+  import DimensionFilter from "@rilldata/web-common/features/dashboards/filters/dimension-filters/DimensionFilter.svelte";
+  import MeasureFilter from "@rilldata/web-common/features/dashboards/filters/measure-filters/MeasureFilter.svelte";
+  import type { MeasureFilterEntry } from "@rilldata/web-common/features/dashboards/filters/measure-filters/measure-filter-entry";
+  import { isExpressionUnsupported } from "@rilldata/web-common/features/dashboards/stores/filter-utils";
+  import { getMapFromArray } from "@rilldata/web-common/lib/arrayUtils";
+  import { flip } from "svelte/animate";
+
+  export let metricsView: string;
+  export let selectedComponentName: string;
+  export let label: string;
+  export let id: string;
+  export let filter: string;
+  export let onChange: (filter: string) => void = () => {};
+
+  const {
+    canvasEntity: {
+      useComponent,
+      spec: { getDimensionsForMetricView, getSimpleMeasuresForMetricView },
+    },
+  } = getCanvasStateManagers();
+
+  $: componentStore = useComponent(selectedComponentName);
+
+  $: allDimensions = getDimensionsForMetricView(metricsView);
+  $: allSimpleMeasures = getSimpleMeasuresForMetricView(metricsView);
+
+  $: ({
+    whereFilter,
+    toggleDimensionValueSelection,
+    removeDimensionFilter,
+    toggleDimensionFilterMode,
+    setMeasureFilter,
+    removeMeasureFilter,
+    setTemporaryFilterName,
+    clearAllFilters,
+    filterText,
+    dimensionHasFilter,
+    getDimensionFilterItems,
+    getAllDimensionFilterItems,
+    isFilterExcludeMode,
+    getMeasureFilterItems,
+    getAllMeasureFilterItems,
+    measureHasFilter,
+  } = componentStore.filters);
+
+  $: dimensionIdMap = getMapFromArray(
+    $allDimensions,
+    (dimension) => (dimension.name || dimension.column) as string,
+  );
+
+  $: measureIdMap = getMapFromArray(
+    $allSimpleMeasures,
+    (m) => m.name as string,
+  );
+
+  $: if ((filter ?? "") !== ($filterText ?? "")) {
+    onChange($filterText);
+  }
+
+  $: currentDimensionFilters = $getDimensionFilterItems(dimensionIdMap);
+  $: allDimensionFilters = $getAllDimensionFilterItems(
+    currentDimensionFilters,
+    dimensionIdMap,
+  );
+
+  $: currentMeasureFilters = $getMeasureFilterItems(measureIdMap);
+  $: allMeasureFilters = $getAllMeasureFilterItems(
+    currentMeasureFilters,
+    measureIdMap,
+  );
+
+  // hasFilter only checks for complete filters and excludes temporary ones
+  $: hasFilters =
+    currentDimensionFilters.length > 0 || currentMeasureFilters.length > 0;
+
+  $: isComplexFilter = isExpressionUnsupported($whereFilter);
+
+  function handleMeasureFilterApply(
+    dimension: string,
+    measureName: string,
+    oldDimension: string,
+    filter: MeasureFilterEntry,
+  ) {
+    if (oldDimension && oldDimension !== dimension) {
+      removeMeasureFilter(oldDimension, measureName);
+    }
+    setMeasureFilter(dimension, filter);
+  }
+</script>
+
+<div class="flex flex-col gap-y-2 pt-1">
+  <div class="flex justify-between gap-x-2">
+    <InputLabel small {label} {id} />
+
+    <FilterButton
+      allDimensions={$allDimensions}
+      filteredSimpleMeasures={$allSimpleMeasures}
+      dimensionHasFilter={$dimensionHasFilter}
+      measureHasFilter={$measureHasFilter}
+      {setTemporaryFilterName}
+      addBorder={false}
+    />
+  </div>
+
+  <div class="relative flex flex-col gap-x-2 gap-y-2 items-start">
+    <div class="relative flex flex-row flex-wrap gap-x-2 gap-y-2">
+      {#if isComplexFilter}
+        <AdvancedFilter advancedFilter={$whereFilter} />
+      {:else if allDimensionFilters.length || allMeasureFilters.length}
+        {#each allDimensionFilters as { name, label, selectedValues } (name)}
+          {@const dimension = $allDimensions.find(
+            (d) => d.name === name || d.column === name,
+          )}
+          {@const dimensionName = dimension?.name || dimension?.column}
+          <div animate:flip={{ duration: 200 }}>
+            {#if dimensionName}
+              <DimensionFilter
+                metricsViewNames={[metricsView]}
+                readOnly={false}
+                smallChip
+                {name}
+                {label}
+                {selectedValues}
+                timeStart={new Date(0).toISOString()}
+                timeEnd={new Date().toISOString()}
+                timeControlsReady
+                excludeMode={$isFilterExcludeMode(name)}
+                onRemove={() => removeDimensionFilter(name)}
+                onToggleFilterMode={() => toggleDimensionFilterMode(name)}
+                onSelect={(value) =>
+                  toggleDimensionValueSelection(name, value, true)}
+              />
+            {/if}
+          </div>
+        {/each}
+        {#each allMeasureFilters as { name, label, dimensionName, filter } (name)}
+          <div animate:flip={{ duration: 200 }}>
+            <MeasureFilter
+              allDimensions={$allDimensions}
+              {name}
+              {label}
+              {dimensionName}
+              {filter}
+              onRemove={() => removeMeasureFilter(dimensionName, name)}
+              onApply={({ dimension, oldDimension, filter }) =>
+                handleMeasureFilterApply(dimension, name, oldDimension, filter)}
+            />
+          </div>
+        {/each}
+      {/if}
+    </div>
+    <div class="ml-auto">
+      {#if hasFilters}
+        <Button type="text" on:click={clearAllFilters}>Clear filters</Button>
+      {/if}
+    </div>
+  </div>
+</div>
diff --git a/web-common/src/features/canvas/inspector/FiltersMapper.svelte b/web-common/src/features/canvas/inspector/filters/FiltersMapper.svelte
similarity index 71%
rename from web-common/src/features/canvas/inspector/FiltersMapper.svelte
rename to web-common/src/features/canvas/inspector/filters/FiltersMapper.svelte
index 4747618357e..d52224585f9 100644
--- a/web-common/src/features/canvas/inspector/FiltersMapper.svelte
+++ b/web-common/src/features/canvas/inspector/filters/FiltersMapper.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
   import Input from "@rilldata/web-common/components/forms/Input.svelte";
   import { type CanvasComponentObj } from "@rilldata/web-common/features/canvas/components/util";
+  import DimensionFiltersInput from "@rilldata/web-common/features/canvas/inspector/filters/DimensionFiltersInput.svelte";
   import { type V1ComponentSpecRendererProperties } from "@rilldata/web-common/runtime-client";
   import { onMount } from "svelte";
 
+  export let selectedComponentName: string;
   export let component: CanvasComponentObj;
   export let paramValues: V1ComponentSpecRendererProperties;
 
@@ -18,9 +20,8 @@
 
   $: inputParams = component.inputParams().filter;
 
-  // Enable this when adding support for dimension filters
-  // $: metricsView =
-  //   "metrics_view" in paramValues ? paramValues.metrics_view : null;
+  $: metricsView =
+    "metrics_view" in paramValues ? paramValues.metrics_view : null;
 
   onMount(() => {
     localParamValues = structuredClone(paramValues) || {};
@@ -30,7 +31,7 @@
 <div>
   {#each Object.entries(inputParams) as [key, config]}
     <div class="component-param">
-      {#if config.type === "time_range" || config.type === "comparison_range" || config.type == "dimension_filters"}
+      {#if config.type === "time_range" || config.type === "comparison_range"}
         <Input
           inputType="text"
           capitalizeLabel={false}
@@ -47,6 +48,18 @@
             component.updateProperty(key, localParamValues[key]);
           }}
         />
+      {:else if config.type == "dimension_filters" && metricsView}
+        <DimensionFiltersInput
+          {metricsView}
+          {selectedComponentName}
+          label={config.label ?? key}
+          id={key}
+          filter={localParamValues[key]}
+          onChange={async (filter) => {
+            localParamValues[key] = filter;
+            component.updateProperty(key, localParamValues[key]);
+          }}
+        />
       {/if}
     </div>
   {/each}
diff --git a/web-common/src/features/canvas/inspector/types.ts b/web-common/src/features/canvas/inspector/types.ts
index 88932dc2f9a..4050545ec4c 100644
--- a/web-common/src/features/canvas/inspector/types.ts
+++ b/web-common/src/features/canvas/inspector/types.ts
@@ -7,12 +7,14 @@ type SemanticInputTypes =
   | "multi_dimensions";
 type ChartInputTypes = "positional" | "mark" | "tooltip" | "config";
 type CustomInputTypes = "rill_time";
+type PositionalInputTypes = "alignment";
 
 export type InputType =
   | NativeInputTypes
   | SemanticInputTypes
   | ChartInputTypes
-  | CustomInputTypes;
+  | CustomInputTypes
+  | PositionalInputTypes;
 
 export type FilterInputTypes =
   | "time_range"
diff --git a/web-common/src/features/canvas/stores/canvas-component.ts b/web-common/src/features/canvas/stores/canvas-component.ts
new file mode 100644
index 00000000000..385f2935f31
--- /dev/null
+++ b/web-common/src/features/canvas/stores/canvas-component.ts
@@ -0,0 +1,27 @@
+import { get } from "svelte/store";
+import { CanvasFilters } from "./canvas-filters";
+import type { CanvasResolvedSpec } from "./canvas-spec";
+
+export class CanvasComponentState {
+  name: string;
+  filters: CanvasFilters;
+  private spec: CanvasResolvedSpec;
+
+  constructor(name: string, spec: CanvasResolvedSpec) {
+    this.name = name;
+    this.filters = new CanvasFilters(spec);
+    this.spec = spec;
+
+    const componentResourceStore = spec.getComponentResource(name);
+    const componentResource = get(componentResourceStore);
+
+    if (
+      componentResource &&
+      componentResource.rendererProperties?.dimension_filters
+    ) {
+      this.filters.setFiltersFromText(
+        componentResource.rendererProperties?.dimension_filters as string,
+      );
+    }
+  }
+}
diff --git a/web-common/src/features/canvas/stores/canvas-entity.ts b/web-common/src/features/canvas/stores/canvas-entity.ts
index 6391211c00f..11456c516da 100644
--- a/web-common/src/features/canvas/stores/canvas-entity.ts
+++ b/web-common/src/features/canvas/stores/canvas-entity.ts
@@ -1,21 +1,32 @@
 import { useCanvas } from "@rilldata/web-common/features/canvas/selector";
 import type { CanvasSpecResponseStore } from "@rilldata/web-common/features/canvas/types";
+import { mergeFilters } from "@rilldata/web-common/features/dashboards/pivot/pivot-merge-filters";
 import {
   buildValidMetricsViewFilter,
   createAndExpression,
 } from "@rilldata/web-common/features/dashboards/stores/filter-utils";
+import { convertFilterParamToExpression } from "@rilldata/web-common/features/dashboards/url-state/filters/converters";
 import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
 import type { DashboardTimeControls } from "@rilldata/web-common/lib/time/types";
-import type { V1TimeRange } from "@rilldata/web-common/runtime-client";
+import {
+  V1Operation,
+  type V1Expression,
+  type V1TimeRange,
+} from "@rilldata/web-common/runtime-client";
 import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
 import { derived, writable, type Writable } from "svelte/store";
+import { CanvasComponentState } from "./canvas-component";
 import { CanvasFilters } from "./canvas-filters";
 import { CanvasResolvedSpec } from "./canvas-spec";
 import { CanvasTimeControls } from "./canvas-time-control";
+import type { GridStack } from "gridstack";
 
 export class CanvasEntity {
   name: string;
 
+  /** Local state store for canvas components */
+  components: Map<string, CanvasComponentState>;
+
   /**
    * Time controls for the canvas entity containing various
    * time related writables
@@ -32,6 +43,8 @@ export class CanvasEntity {
    */
   spec: CanvasResolvedSpec;
 
+  gridstack?: GridStack | null;
+
   /**
    * Index of the component higlighted or selected in the canvas
    */
@@ -44,30 +57,48 @@ export class CanvasEntity {
 
     this.name = name;
 
+    this.components = new Map();
     this.selectedComponentIndex = writable(null);
     this.spec = new CanvasResolvedSpec(validSpecStore);
     this.timeControls = new CanvasTimeControls(validSpecStore);
     this.filters = new CanvasFilters(this.spec);
   }
 
-  setSelectedComponentIndex(index: number | null) {
+  setSelectedComponentIndex = (index: number | null) => {
     this.selectedComponentIndex.set(index);
+  };
+
+  useComponent = (componentName: string) => {
+    let componentEntity = this.components.get(componentName);
+
+    if (!componentEntity) {
+      componentEntity = new CanvasComponentState(componentName, this.spec);
+      this.components.set(componentName, componentEntity);
+    }
+    return componentEntity;
+  };
+
+  setGridstack(gridstack: GridStack | null) {
+    this.gridstack = gridstack;
   }
 
   /**
    * Helper method to get the time range and where clause for a given metrics view
    * with the ability to override the time range and filter
    */
-  createTimeAndFilterStore(
+  createTimeAndFilterStore = (
     metricsViewName: string,
     {
-      timeRangeStore,
-      overrideTimeRange,
+      componentTimeRange,
+      componentComparisonRange,
+      componentFilter,
     }: {
-      timeRangeStore: Writable<DashboardTimeControls | undefined>;
-      overrideTimeRange?: string;
+      timeRangeStore?: Writable<DashboardTimeControls | undefined>;
+      componentTimeRange?: string;
+      componentComparisonRange?: string;
+      componentFilter?: string;
     },
-  ) {
+  ) => {
     const { timeControls, filters, spec } = this;
 
     const dimensionsStore = spec.getDimensionsForMetricView(metricsViewName);
@@ -75,29 +106,66 @@ export class CanvasEntity {
 
     return derived(
       [
-        timeRangeStore,
+        timeControls.selectedTimeRange,
         timeControls.selectedTimezone,
+        timeControls.selectedComparisonTimeRange,
         filters.whereFilter,
         filters.dimensionThresholdFilters,
         dimensionsStore,
         measuresStore,
       ],
-      ([timeRangeVal, timeZone, whereFilter, dtf, dimensions, measures]) => {
+      ([
+        globalTimeRange,
+        timeZone,
+        globalComparisonRange,
+        whereFilter,
+        dtf,
+        dimensions,
+        measures,
+      ]) => {
+        // Time Range
         let timeRange: V1TimeRange = {
-          start: timeRangeVal?.start?.toISOString(),
-          end: timeRangeVal?.end?.toISOString(),
+          start: globalTimeRange?.start?.toISOString(),
+          end: globalTimeRange?.end?.toISOString(),
+          timeZone,
+        };
+        if (componentTimeRange) {
+          // TODO: update logic
+          timeRange = { isoDuration: componentTimeRange, timeZone };
+        }
+        const timeGrain = globalTimeRange?.interval;
+
+        // Comparison Range
+        let comparisonRange: V1TimeRange = {
+          start: globalComparisonRange?.start?.toISOString(),
+          end: globalComparisonRange?.end?.toISOString(),
           timeZone,
         };
-        if (overrideTimeRange) {
-          timeRange = { isoDuration: overrideTimeRange, timeZone };
+        if (componentComparisonRange) {
+          // TODO: update logic
+          comparisonRange = { isoDuration: componentComparisonRange, timeZone };
         }
 
-        const where =
+        // Dimension Filters
+        const globalWhere =
           buildValidMetricsViewFilter(whereFilter, dtf, dimensions, measures) ??
           createAndExpression([]);
 
-        return { timeRange, where };
+        let where: V1Expression | undefined = globalWhere;
+
+        if (componentFilter) {
+          let expr = convertFilterParamToExpression(componentFilter);
+          if (
+            expr?.cond?.op !== V1Operation.OPERATION_AND &&
+            expr?.cond?.op !== V1Operation.OPERATION_OR
+          ) {
+            expr = createAndExpression([expr]);
+          }
+          where = mergeFilters(globalWhere, expr);
+        }
+
+        return { timeRange, comparisonRange, where, timeGrain };
       },
     );
-  }
+  };
 }
diff --git a/web-common/src/features/canvas/stores/canvas-filters.ts b/web-common/src/features/canvas/stores/canvas-filters.ts
index aeb7afb1845..d0945664045 100644
--- a/web-common/src/features/canvas/stores/canvas-filters.ts
+++ b/web-common/src/features/canvas/stores/canvas-filters.ts
@@ -4,7 +4,10 @@ import {
   getMeasureDisplayName,
 } from "@rilldata/web-common/features/dashboards/filters/getDisplayName";
 import type { MeasureFilterEntry } from "@rilldata/web-common/features/dashboards/filters/measure-filters/measure-filter-entry";
-import { splitWhereFilter } from "@rilldata/web-common/features/dashboards/filters/measure-filters/measure-filter-utils";
+import {
+  mergeDimensionAndMeasureFilter,
+  splitWhereFilter,
+} from "@rilldata/web-common/features/dashboards/filters/measure-filters/measure-filter-utils";
 import type { DimensionFilterItem } from "@rilldata/web-common/features/dashboards/state-managers/selectors/dimension-filters";
 import { filterItemsSortFunction } from "@rilldata/web-common/features/dashboards/state-managers/selectors/filters";
 import type { MeasureFilterItem } from "@rilldata/web-common/features/dashboards/state-managers/selectors/measure-filters";
@@ -17,8 +20,13 @@ import {
   isExpressionUnsupported,
   matchExpressionByName,
   negateExpression,
+  sanitiseExpression,
 } from "@rilldata/web-common/features/dashboards/stores/filter-utils";
 import type { DimensionThresholdFilter } from "@rilldata/web-common/features/dashboards/stores/metrics-explorer-entity";
+import {
+  convertExpressionToFilterParam,
+  convertFilterParamToExpression,
+} from "@rilldata/web-common/features/dashboards/url-state/filters/converters";
 import type {
   MetricsViewSpecDimensionV2,
   V1Expression,
@@ -83,6 +91,7 @@ export class CanvasFilters {
   >;
   includedDimensionValues: Readable<(dimensionName: string) => unknown[]>;
   hasAtLeastOneDimensionFilter: Readable<() => boolean>;
+  filterText: Readable<string>;
 
   constructor(spec: CanvasResolvedSpec) {
     // -----------------------------
@@ -297,6 +306,22 @@ export class CanvasFilters {
         };
       },
     );
+
+    this.filterText = derived(
+      [this.whereFilter, this.dimensionThresholdFilters],
+      ([$whereFilter, $dtf]) => {
+        const mergedFilters =
+          sanitiseExpression(
+            mergeDimensionAndMeasureFilter(
+              $whereFilter ?? createAndExpression([]),
+              $dtf,
+            ),
+            undefined,
+          ) ?? createAndExpression([]);
+
+        return convertExpressionToFilterParam(mergedFilters);
+      },
+    );
   }
 
   private getMeasureFilters = (
@@ -533,4 +558,15 @@ export class CanvasFilters {
   setTemporaryFilterName = (name: string) => {
     this.temporaryFilterName.set(name);
   };
+
+  setFiltersFromText = (filterText: string) => {
+    let expr = convertFilterParamToExpression(filterText);
+    if (
+      expr?.cond?.op !== V1Operation.OPERATION_AND &&
+      expr?.cond?.op !== V1Operation.OPERATION_OR
+    ) {
+      expr = createAndExpression([expr]);
+    }
+    this.setFilters(expr);
+  };
 }
diff --git a/web-common/src/features/canvas/stores/canvas-spec.ts b/web-common/src/features/canvas/stores/canvas-spec.ts
index 5f30591ff45..8d03785ff69 100644
--- a/web-common/src/features/canvas/stores/canvas-spec.ts
+++ b/web-common/src/features/canvas/stores/canvas-spec.ts
@@ -4,6 +4,8 @@ import {
   type MetricsViewSpecDimensionV2,
   type MetricsViewSpecMeasureV2,
   type V1CanvasSpec,
+  type V1ComponentSpec,
+  type V1MetricsViewSpec,
 } from "@rilldata/web-common/runtime-client";
 import { derived, get, type Readable } from "svelte/store";
 
@@ -12,6 +14,9 @@ export class CanvasResolvedSpec {
   isLoading: Readable<boolean>;
   metricViewNames: Readable<string[]>;
 
+  getMetricsViewFromName: (
+    metricViewName: string,
+  ) => Readable<V1MetricsViewSpec | undefined>;
   /** Measure Selectors */
   getMeasuresForMetricView: (
     metricViewName: string,
@@ -47,6 +52,11 @@ export class CanvasResolvedSpec {
   allDimensions: Readable<MetricsViewSpecDimensionV2[]>;
   metricsViewDimensionsMap: Readable<Record<string, Set<string>>>;
 
+  /** Component Selectors */
+  getComponentResource: (
+    componentName: string,
+  ) => Readable<V1ComponentSpec | undefined>;
+
   constructor(validSpecStore: CanvasSpecResponseStore) {
     this.canvasSpec = derived(validSpecStore, ($validSpecStore) => {
       return $validSpecStore.data?.canvas;
@@ -60,6 +70,13 @@ export class CanvasResolvedSpec {
       Object.keys($validSpecStore?.data?.metricsViews || {}),
     );
 
+    this.getMetricsViewFromName = (metricViewName: string) =>
+      derived(validSpecStore, ($validSpecStore) => {
+        const metricsView = $validSpecStore.data?.metricsViews[metricViewName];
+        if (!metricsView) return;
+        return metricsView.state?.validSpec;
+      });
+
     this.getMeasuresForMetricView = (metricViewName: string) =>
       derived(validSpecStore, ($validSpecStore) => {
         if (!$validSpecStore.data) return [];
@@ -175,6 +192,13 @@ export class CanvasResolvedSpec {
         return metricsViewDimensionMap;
       },
     );
+
+    this.getComponentResource = (componentName: string) => {
+      return derived(validSpecStore, ($validSpecStore) => {
+        return $validSpecStore?.data?.components?.[componentName]?.component
+          ?.spec;
+      });
+    };
   }
 
   getDimensionsFromMeasure(measureName: string): MetricsViewSpecDimensionV2[] {
diff --git a/web-common/src/features/canvas/types.ts b/web-common/src/features/canvas/types.ts
index 2f511413a6e..eb378a35c4b 100644
--- a/web-common/src/features/canvas/types.ts
+++ b/web-common/src/features/canvas/types.ts
@@ -2,9 +2,33 @@ import type { QueryObserverResult } from "@rilldata/svelte-query";
 import type { CanvasResponse } from "@rilldata/web-common/features/canvas/selector";
 import type { RpcStatus } from "@rilldata/web-common/runtime-client";
 import type { Readable } from "svelte/store";
-
-export type Vector = [number, number];
+import type { GridItemHTMLElement, GridStackNode } from "gridstack";
 
 export type CanvasSpecResponseStore = Readable<
   QueryObserverResult<CanvasResponse, RpcStatus>
 >;
+
+export type GridstackDispatchEvents = {
+  added: { event: Event; nodes: GridStackNode[] };
+  change: { event: Event; nodes: GridStackNode[] };
+  disable: { event: Event };
+  dragstart: { event: Event; el: GridItemHTMLElement };
+  drag: { event: Event; el: GridItemHTMLElement };
+  dragstop: { event: Event; el: GridItemHTMLElement };
+  dropped: {
+    event: Event;
+    previousNode: GridStackNode;
+    newNode: GridStackNode;
+  };
+  enable: { event: Event };
+  removed: { event: Event; el: GridItemHTMLElement };
+  resizestart: { event: Event; el: GridItemHTMLElement };
+  resize: { event: Event; el: GridItemHTMLElement };
+  resizestop: { event: Event; el: GridItemHTMLElement };
+};
+
+export type GridstackCallbackParams =
+  | Event
+  | GridStackNode
+  | GridStackNode[]
+  | GridItemHTMLElement;
diff --git a/web-common/src/features/canvas/util.ts b/web-common/src/features/canvas/util.ts
index eefc9205fb0..d2479b4c2f1 100644
--- a/web-common/src/features/canvas/util.ts
+++ b/web-common/src/features/canvas/util.ts
@@ -1,23 +1,81 @@
-import type { Vector } from "./types";
-
-export const vector = {
-  add: (add: Vector, initial: Vector): Vector => {
-    return [add[0] + initial[0], add[1] + initial[1]];
-  },
-  multiply: (vector: Vector, multiplier: Vector): Vector => {
-    return [vector[0] * multiplier[0], vector[1] * multiplier[1]];
-  },
-  subtract: (minuend: Vector, subtrahend: Vector): Vector => {
-    return [minuend[0] - subtrahend[0], minuend[1] - subtrahend[1]];
-  },
-  absolute: (vector: Vector): Vector => {
-    return [Math.abs(vector[0]), Math.abs(vector[1])];
-  },
-  divide: (vector: Vector, divisor: Vector): Vector => {
-    return [vector[0] / divisor[0], vector[1] / divisor[1]];
-  },
-};
+import * as defaults from "./constants";
 
 export function isString(value: unknown): value is string {
   return typeof value === "string";
 }
+
+type GridRow = {
+  y: number;
+  items: PositionedItem[];
+};
+
+interface PositionedItem {
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+}
+
+/**
+ * Finds the next available position for a new component in the grid
+ */
+export function findNextAvailablePosition(
+  existingItems: PositionedItem[],
+  newWidth: number,
+  newHeight: number,
+): [number, number] {
+  if (!existingItems?.length) return [0, 0];
+
+  const rows = existingItems.reduce((acc, item) => {
+    if (!acc.has(item.y)) {
+      acc.set(item.y, { y: item.y, items: [] });
+    }
+    acc.get(item.y)!.items.push(item);
+    return acc;
+  }, new Map<number, GridRow>());
+
+  const sortedRows = Array.from(rows.values()).sort((a, b) => a.y - b.y);
+
+  for (const row of sortedRows) {
+    const sortedItems = row.items.sort((a, b) => a.x - b.x);
+
+    let x = 0;
+    for (const item of sortedItems) {
+      if (item.x - x >= newWidth) {
+        const hasOverlap = existingItems.some(
+          (other) =>
+            other.y !== row.y && // Different row
+            other.y < row.y + newHeight && // Overlaps vertically
+            other.y + other.height > row.y &&
+            other.x < x + newWidth && // Overlaps horizontally
+            other.x + other.width > x,
+        );
+
+        if (!hasOverlap) return [x, row.y];
+      }
+      x = item.x + item.width;
+    }
+
+    // Check if there's space at the end of the row
+    if (x + newWidth <= defaults.DEFAULT_COLUMN_COUNT) {
+      const hasOverlap = existingItems.some(
+        (other) =>
+          other.y !== row.y &&
+          other.y < row.y + newHeight &&
+          other.y + other.height > row.y &&
+          other.x < x + newWidth &&
+          other.x + other.width > x,
+      );
+
+      if (!hasOverlap) return [x, row.y];
+    }
+  }
+
+  // If no gaps found, add to new row
+  const lastRowY = Math.max(
+    ...existingItems.map((item) => item.y + item.height),
+    0,
+  );
+
+  return [0, lastRowY];
+}
diff --git a/web-common/src/features/dashboards/filters/FilterButton.svelte b/web-common/src/features/dashboards/filters/FilterButton.svelte
index a48bb471fc6..8dab3120495 100644
--- a/web-common/src/features/dashboards/filters/FilterButton.svelte
+++ b/web-common/src/features/dashboards/filters/FilterButton.svelte
@@ -17,6 +17,7 @@
   export let dimensionHasFilter: (dimensionName: string) => boolean;
   export let measureHasFilter: (measureName: string) => boolean;
   export let setTemporaryFilterName: (name: string) => void;
+  export let addBorder = true;
 
   let open = false;
 
@@ -47,7 +48,12 @@
 <DropdownMenu.Root bind:open typeahead={false}>
   <DropdownMenu.Trigger asChild let:builder>
     <Tooltip distance={8} suppress={open}>
-      <button class:active={open} use:builder.action {...builder}>
+      <button
+        class:addBorder
+        class:active={open}
+        use:builder.action
+        {...builder}
+      >
         <Add size="17px" />
       </button>
       <TooltipContent slot="tooltip-content">Add filter</TooltipContent>
@@ -68,10 +74,14 @@
   button {
     @apply w-[34px] h-[26px] rounded-2xl;
     @apply flex items-center justify-center;
-    @apply border border-dashed border-slate-300;
+
     @apply bg-white;
   }
 
+  button.addBorder {
+    @apply border border-dashed border-slate-300;
+  }
+
   button:hover {
     @apply bg-slate-100;
   }
diff --git a/web-common/src/features/dashboards/filters/dimension-filters/DimensionFilter.svelte b/web-common/src/features/dashboards/filters/dimension-filters/DimensionFilter.svelte
index 062c72eaf05..a37d16e69c0 100644
--- a/web-common/src/features/dashboards/filters/dimension-filters/DimensionFilter.svelte
+++ b/web-common/src/features/dashboards/filters/dimension-filters/DimensionFilter.svelte
@@ -21,6 +21,7 @@
   export let timeStart: string | undefined;
   export let timeEnd: string | undefined;
   export let timeControlsReady: boolean | undefined;
+  export let smallChip = false;
   export let onRemove: () => void;
   export let onSelect: (value: string) => void;
   export let onToggleFilterMode: () => void;
@@ -96,6 +97,7 @@
           slot="body"
           label={excludeMode ? `Exclude ${label}` : label}
           show={1}
+          {smallChip}
           values={selectedValues}
         />
       </Chip>
diff --git a/web-common/src/features/dashboards/pivot/PivotDisplay.svelte b/web-common/src/features/dashboards/pivot/PivotDisplay.svelte
index 648cf7d32cf..c034dca6d16 100644
--- a/web-common/src/features/dashboards/pivot/PivotDisplay.svelte
+++ b/web-common/src/features/dashboards/pivot/PivotDisplay.svelte
@@ -7,13 +7,13 @@
   import PivotSidebar from "./PivotSidebar.svelte";
   import PivotTable from "./PivotTable.svelte";
   import PivotToolbar from "./PivotToolbar.svelte";
-  import { usePivotDataStore } from "./pivot-data-store";
+  import { usePivotForExplore } from "./pivot-data-store";
 
   const stateManagers = getStateManagers();
 
   let showPanels = true;
 
-  $: pivotDataStore = usePivotDataStore(stateManagers);
+  $: pivotDataStore = usePivotForExplore(stateManagers);
 
   $: ({ isFetching, assembled } = $pivotDataStore);
 
diff --git a/web-common/src/features/dashboards/pivot/pivot-data-store.ts b/web-common/src/features/dashboards/pivot/pivot-data-store.ts
index 9ee0d5f2c56..fc8a57db874 100644
--- a/web-common/src/features/dashboards/pivot/pivot-data-store.ts
+++ b/web-common/src/features/dashboards/pivot/pivot-data-store.ts
@@ -51,6 +51,7 @@ import {
   isTimeDimension,
 } from "./pivot-utils";
 import {
+  type PivotDashboardContext,
   type PivotDataRow,
   type PivotDataStore,
   type PivotDataStoreConfig,
@@ -65,7 +66,7 @@ import {
  * table.
  */
 export function createTableCellQuery(
-  ctx: StateManagers,
+  ctx: PivotDashboardContext,
   config: PivotDataStoreConfig,
   anchorDimension: string | undefined,
   columnDimensionAxesData: Record<string, string[]> | undefined,
@@ -173,14 +174,13 @@ let expandedTableMap: Record<string, PivotDataRow[]> = {};
  * Table data and column definitions
  */
 export function createPivotDataStore(
-  ctx: StateManagers,
-  configStore: Readable<PivotDataStoreConfig> | undefined = undefined,
+  ctx: PivotDashboardContext,
+  configStore: Readable<PivotDataStoreConfig>,
 ): PivotDataStore {
   /**
    * Derive a store using pivot config
    */
 
-  if (!configStore) configStore = getPivotConfig(ctx);
   return derived(configStore, (config, configSet) => {
     const { rowDimensionNames, colDimensionNames, measureNames } = config;
     if (
@@ -575,6 +575,14 @@ export function createPivotDataStore(
 /**
  * Memoized version of the store. Currently, memoized by metrics view name.
  */
-export const usePivotDataStore = memoizeMetricsStore<PivotDataStore>(
-  (ctx: StateManagers) => createPivotDataStore(ctx),
+export const usePivotForExplore = memoizeMetricsStore<PivotDataStore>(
+  (ctx: StateManagers) => {
+    const pivotConfig = getPivotConfig(ctx);
+    const pivotDashboardContext: PivotDashboardContext = {
+      metricsViewName: ctx.metricsViewName,
+      queryClient: ctx.queryClient,
+      enabled: !!ctx.dashboardStore,
+    };
+    return createPivotDataStore(pivotDashboardContext, pivotConfig);
+  },
 );
diff --git a/web-common/src/features/dashboards/pivot/pivot-expansion.ts b/web-common/src/features/dashboards/pivot/pivot-expansion.ts
index 17fca1f2499..41c44f19d84 100644
--- a/web-common/src/features/dashboards/pivot/pivot-expansion.ts
+++ b/web-common/src/features/dashboards/pivot/pivot-expansion.ts
@@ -1,5 +1,4 @@
 import { mergeFilters } from "@rilldata/web-common/features/dashboards/pivot/pivot-merge-filters";
-import type { StateManagers } from "@rilldata/web-common/features/dashboards/state-managers/state-managers";
 import {
   createAndExpression,
   createInExpression,
@@ -34,6 +33,7 @@ import {
   mergeTimeStrings,
 } from "./pivot-utils";
 import type {
+  PivotDashboardContext,
   PivotDataRow,
   PivotDataStoreConfig,
   PivotQueryError,
@@ -83,7 +83,7 @@ export function getValuesForExpandedKey(
  * rows optimally.
  */
 export function createSubTableCellQuery(
-  ctx: StateManagers,
+  ctx: PivotDashboardContext,
   config: PivotDataStoreConfig,
   anchorDimension: string,
   columnDimensionAxesData: Record<string, string[]> | undefined,
@@ -172,7 +172,7 @@ export function getExpandedErrorState(
  * and the row dimension values
  */
 export function queryExpandedRowMeasureValues(
-  ctx: StateManagers,
+  ctx: PivotDashboardContext,
   config: PivotDataStoreConfig,
   tableData: PivotDataRow[],
   columnDimensionAxesData: Record<string, string[]> | undefined,
diff --git a/web-common/src/features/dashboards/pivot/pivot-queries.ts b/web-common/src/features/dashboards/pivot/pivot-queries.ts
index 86f65f69494..ffa648638f4 100644
--- a/web-common/src/features/dashboards/pivot/pivot-queries.ts
+++ b/web-common/src/features/dashboards/pivot/pivot-queries.ts
@@ -1,4 +1,3 @@
-import type { StateManagers } from "@rilldata/web-common/features/dashboards/state-managers/state-managers";
 import {
   createAndExpression,
   createInExpression,
@@ -15,6 +14,7 @@ import {
   createQueryServiceMetricsViewAggregation,
 } from "@rilldata/web-common/runtime-client";
 import type { HTTPError } from "@rilldata/web-common/runtime-client/fetchWrapper";
+import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
 import type { CreateQueryResult } from "@tanstack/svelte-query";
 import { type Readable, derived, readable } from "svelte/store";
 import { mergeFilters } from "./pivot-merge-filters";
@@ -29,6 +29,7 @@ import {
   COMPARISON_DELTA,
   COMPARISON_PERCENT,
   type PivotAxesData,
+  type PivotDashboardContext,
   type PivotDataStoreConfig,
   type PivotQueryError,
 } from "./types";
@@ -37,7 +38,7 @@ import {
  * Wrapper function for Aggregate Query API
  */
 export function createPivotAggregationRowQuery(
-  ctx: StateManagers,
+  ctx: PivotDashboardContext,
   config: PivotDataStoreConfig,
   measures: V1MetricsViewAggregationMeasure[],
   dimensions: V1MetricsViewAggregationDimension[],
@@ -69,16 +70,15 @@ export function createPivotAggregationRowQuery(
   }
 
   return derived(
-    [ctx.runtime, ctx.metricsViewName],
-    ([runtime, metricsViewName], set) =>
+    [runtime, ctx.metricsViewName],
+    ([$runtime, metricsViewName], set) =>
       createQueryServiceMetricsViewAggregation(
-        runtime.instanceId,
+        $runtime.instanceId,
         metricsViewName,
         {
           measures: prepareMeasureForComparison(measures),
           dimensions,
           where: sanitiseExpression(whereFilter, undefined),
-          whereSql: config.pivot?.whereSql,
           timeRange: {
             start: timeRange?.start ? timeRange.start : config.time.timeStart,
             end: timeRange?.end ? timeRange.end : config.time.timeEnd,
@@ -96,7 +96,7 @@ export function createPivotAggregationRowQuery(
         },
         {
           query: {
-            enabled: !!ctx.dashboardStore,
+            enabled: ctx.enabled,
             queryClient: ctx.queryClient,
             keepPreviousData: true,
           },
@@ -109,7 +109,7 @@ export function createPivotAggregationRowQuery(
  * Get a list of axis values for a given list of dimension values and filters
  */
 export function getAxisForDimensions(
-  ctx: StateManagers,
+  ctx: PivotDashboardContext,
   config: PivotDataStoreConfig,
   dimensions: string[],
   measures: V1MetricsViewAggregationMeasure[],
@@ -210,7 +210,7 @@ export function getAxisForDimensions(
 }
 
 export function getAxisQueryForMeasureTotals(
-  ctx: StateManagers,
+  ctx: PivotDashboardContext,
   config: PivotDataStoreConfig,
   isMeasureSortAccessor: boolean,
   sortAccessor: string | undefined,
@@ -253,7 +253,7 @@ export function getAxisQueryForMeasureTotals(
 }
 
 export function getTotalsRowQuery(
-  ctx: StateManagers,
+  ctx: PivotDashboardContext,
   config: PivotDataStoreConfig,
   colDimensionAxes: Record<string, string[]> = {},
 ) {
diff --git a/web-common/src/features/dashboards/pivot/types.ts b/web-common/src/features/dashboards/pivot/types.ts
index 8e5f6eb68fa..6d79d7c7023 100644
--- a/web-common/src/features/dashboards/pivot/types.ts
+++ b/web-common/src/features/dashboards/pivot/types.ts
@@ -6,6 +6,7 @@ import type {
   V1MetricsViewAggregationResponseDataItem,
   V1TimeGrain,
 } from "@rilldata/web-common/runtime-client";
+import type { QueryClient } from "@tanstack/svelte-query";
 import type {
   ColumnDef,
   ExpandedState,
@@ -36,6 +37,12 @@ export interface PivotCell {
   columnId: string;
 }
 
+export interface PivotDashboardContext {
+  metricsViewName: Readable<string>;
+  queryClient: QueryClient;
+  enabled: boolean;
+}
+
 export interface PivotState {
   active: boolean;
   columns: PivotColumns;
@@ -47,7 +54,6 @@ export interface PivotState {
   enableComparison: boolean;
   rowJoinType: PivotRowJoinType;
   activeCell: PivotCell | null;
-  whereSql?: string;
 }
 
 export type PivotRowJoinType = "flat" | "nest";
diff --git a/web-common/src/features/dashboards/rows-viewer/RowsViewerAccordion.svelte b/web-common/src/features/dashboards/rows-viewer/RowsViewerAccordion.svelte
index 6e0dfb72826..0b3628173f4 100644
--- a/web-common/src/features/dashboards/rows-viewer/RowsViewerAccordion.svelte
+++ b/web-common/src/features/dashboards/rows-viewer/RowsViewerAccordion.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import CaretDownIcon from "@rilldata/web-common/components/icons/CaretDownIcon.svelte";
-  import { usePivotDataStore } from "@rilldata/web-common/features/dashboards/pivot/pivot-data-store";
+  import { usePivotForExplore } from "@rilldata/web-common/features/dashboards/pivot/pivot-data-store";
   import { getStateManagers } from "@rilldata/web-common/features/dashboards/state-managers/state-managers";
   import { sanitiseExpression } from "@rilldata/web-common/features/dashboards/stores/filter-utils";
   import { useTimeControlStore } from "@rilldata/web-common/features/dashboards/time-controls/time-control-store";
@@ -47,7 +47,7 @@
   $: ({ instanceId } = $runtime);
 
   $: exploreState = useExploreState(exploreName);
-  $: pivotDataStore = usePivotDataStore(stateManagers);
+  $: pivotDataStore = usePivotForExplore(stateManagers);
   $: showPivot = $exploreState.pivot.active;
   $: activeCellFilters = $pivotDataStore.activeCellFilters;
 
diff --git a/web-common/src/features/file-explorer/new-files.ts b/web-common/src/features/file-explorer/new-files.ts
index 2fe5a79f9d3..e90980758f8 100644
--- a/web-common/src/features/file-explorer/new-files.ts
+++ b/web-common/src/features/file-explorer/new-files.ts
@@ -247,14 +247,6 @@ vega_lite: |
     case ResourceKind.Canvas:
       return `type: canvas
 title: "Canvas Dashboard"
-items:
-  - component:
-      markdown:
-        content: "First Component"
-    width: 4
-    height: 3
-    x: 2
-    y: 1
 `;
     case ResourceKind.Theme:
       return `# Theme YAML
diff --git a/web-common/src/features/templates/utils.ts b/web-common/src/features/templates/utils.ts
index 1430ddc91c2..a78fa67be61 100644
--- a/web-common/src/features/templates/utils.ts
+++ b/web-common/src/features/templates/utils.ts
@@ -45,7 +45,7 @@ export const validateMeasures = (
   metricsSpecQueryResult: QueryObserverResult<V1MetricsViewSpec, HTTPError>,
   measureNames: string[],
 ): { isValid: boolean; invalidMeasures: string[] } => {
-  const invalidMeasures = measureNames.filter(
+  const invalidMeasures = measureNames?.filter(
     (m) => !isMeasureValid(metricsSpecQueryResult, m),
   );
   return {
diff --git a/web-common/src/features/visual-editing/SidebarWrapper.svelte b/web-common/src/features/visual-editing/SidebarWrapper.svelte
index e759d8b4849..4d46430f04e 100644
--- a/web-common/src/features/visual-editing/SidebarWrapper.svelte
+++ b/web-common/src/features/visual-editing/SidebarWrapper.svelte
@@ -13,9 +13,10 @@
   </div>
 
   <div
-    class="{disableHorizontalPadding
-      ? ''
-      : 'px-5'} flex flex-col gap-y-3 w-full h-full overflow-y-auto overflow-x-visible"
+    class="flex flex-col w-full h-full overflow-y-auto overflow-x-visible"
+    class:px-5={!disableHorizontalPadding}
+    class:gap-y-1={type === "secondary"}
+    class:gap-y-3={type === "primary"}
   >
     <slot />
   </div>
diff --git a/web-common/src/features/workspaces/CanvasWorkspace.svelte b/web-common/src/features/workspaces/CanvasWorkspace.svelte
index 6e52fc58328..e59efdb2244 100644
--- a/web-common/src/features/workspaces/CanvasWorkspace.svelte
+++ b/web-common/src/features/workspaces/CanvasWorkspace.svelte
@@ -29,6 +29,7 @@
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
   import { parseDocument } from "yaml";
   import PreviewButton from "../explores/PreviewButton.svelte";
+  import { findNextAvailablePosition } from "@rilldata/web-common/features/canvas/util";
 
   export let fileArtifact: FileArtifact;
 
@@ -47,6 +48,7 @@
     getAllErrors,
     remoteContent,
     hasUnsavedChanges,
+    saveLocalContent,
   } = fileArtifact);
 
   $: resourceQuery = getResource(queryClient, instanceId);
@@ -86,27 +88,32 @@
     if (newRoute) await goto(newRoute);
   }
 
-  function addComponent(componentName: CanvasComponentType) {
+  async function addComponent(componentType: CanvasComponentType) {
     const defaultMetrics = $metricsViewQuery?.data;
     if (!defaultMetrics) return;
 
-    const newSpec = componentRegistry[componentName].newComponentSpec(
+    const newSpec = componentRegistry[componentType].newComponentSpec(
       defaultMetrics.metricsView,
       defaultMetrics.measure,
       defaultMetrics.dimension,
     );
 
-    const { width, height } = componentRegistry[componentName].defaultSize;
+    const { width, height } = componentRegistry[componentType].defaultSize;
+
+    const parsedDocument = parseDocument($editorContent ?? "");
+    const items = parsedDocument.get("items") as any;
+    const itemsJson = parsedDocument.toJSON();
+    const existingItems = itemsJson?.items || [];
+
+    const [x, y] = findNextAvailablePosition(existingItems, width, height);
+
     const newComponent = {
-      component: { [componentName]: newSpec },
+      component: { [componentType]: newSpec },
       height,
       width,
-      x: 0,
-      y: 0,
+      x,
+      y,
     };
-    const parsedDocument = parseDocument($editorContent ?? "");
-
-    const items = parsedDocument.get("items") as any;
 
     if (!items) {
       parsedDocument.set("items", [newComponent]);
@@ -114,7 +121,19 @@
       items.add(newComponent);
     }
 
-    updateEditorContent(parsedDocument.toString(), false, true);
+    const newIndex = existingItems.length;
+    updateEditorContent(parsedDocument.toString(), true);
+    await saveLocalContent();
+    scrollToComponent(newIndex);
+  }
+
+  function scrollToComponent(index: number) {
+    setTimeout(() => {
+      const component = document.querySelector(`[data-index="${index}"]`);
+      if (component) {
+        component.scrollIntoView({ behavior: "smooth", block: "center" });
+      }
+    }, 100);
   }
 </script>
 
diff --git a/web-local/src/routes/(viz)/canvas/[name]/+page.svelte b/web-local/src/routes/(viz)/canvas/[name]/+page.svelte
index c02204b58ce..19161027d00 100644
--- a/web-local/src/routes/(viz)/canvas/[name]/+page.svelte
+++ b/web-local/src/routes/(viz)/canvas/[name]/+page.svelte
@@ -6,17 +6,15 @@
 
   export let data: PageData;
 
-  let columns = 20;
-  let gap = 1;
   $: canvasName = data.dashboardName;
 </script>
 
 <StateManagersProvider {canvasName}>
   <CanvasThemeProvider>
     <CanvasDashboardEmbed
+      showFilterBar={data.dashboard.spec?.filtersEnabled}
       items={data.dashboard.spec?.items || []}
-      {columns}
-      {gap}
+      spec={data.dashboard.spec || {}}
     />
   </CanvasThemeProvider>
 </StateManagersProvider>

From a7c706f1e2689389c0f5714ff02e4638db2832ea Mon Sep 17 00:00:00 2001
From: Brian Holmes <120223836+briangregoryholmes@users.noreply.github.com>
Date: Tue, 28 Jan 2025 10:01:30 -0500
Subject: [PATCH 12/48] feat: project initialization tests (#6515)

* feat: project initialization tests

* revert changes
---
 .../src/features/welcome/ProjectCards.svelte  | 22 +-----------
 web-common/src/features/welcome/constants.ts  | 24 +++++++++++++
 web-local/tests/init.spec.ts                  | 35 +++++++++++++++++++
 web-local/tests/utils/test.ts                 | 27 ++++++++------
 4 files changed, 76 insertions(+), 32 deletions(-)
 create mode 100644 web-local/tests/init.spec.ts

diff --git a/web-common/src/features/welcome/ProjectCards.svelte b/web-common/src/features/welcome/ProjectCards.svelte
index 192343b5f80..9d332d6fbe8 100644
--- a/web-common/src/features/welcome/ProjectCards.svelte
+++ b/web-common/src/features/welcome/ProjectCards.svelte
@@ -16,31 +16,11 @@
   } from "../../runtime-client";
   import { runtime } from "../../runtime-client/runtime-store";
   import { EMPTY_PROJECT_TITLE } from "./constants";
+  import { EXAMPLES } from "./constants";
 
   const unpackExampleProject = createRuntimeServiceUnpackExample();
   const unpackEmptyProject = createRuntimeServiceUnpackEmpty();
 
-  const EXAMPLES = [
-    {
-      name: "rill-cost-monitoring",
-      title: "Cost Monitoring",
-      description: "Monitoring cloud infrastructure",
-      image: "/img/welcome-bg-cost-monitoring.png",
-    },
-    {
-      name: "rill-openrtb-prog-ads",
-      title: "OpenRTB Programmatic Ads",
-      description: "Real-time Bidding (RTB) advertising",
-      image: "/img/welcome-bg-openrtb.png",
-    },
-    {
-      name: "rill-github-analytics",
-      title: "Github Analytics",
-      description: "A Git project's commit activity",
-      image: "/img/welcome-bg-github-analytics.png",
-    },
-  ];
-
   let selectedProjectName: string | null = null;
 
   $: ({ instanceId } = $runtime);
diff --git a/web-common/src/features/welcome/constants.ts b/web-common/src/features/welcome/constants.ts
index 7f437af3893..204927e29e5 100644
--- a/web-common/src/features/welcome/constants.ts
+++ b/web-common/src/features/welcome/constants.ts
@@ -1 +1,25 @@
 export const EMPTY_PROJECT_TITLE = "Untitled Rill Project";
+
+export const EXAMPLES = [
+  {
+    name: "rill-cost-monitoring",
+    title: "Cost Monitoring",
+    description: "Monitoring cloud infrastructure",
+    image: "/img/welcome-bg-cost-monitoring.png",
+    firstFile: "metrics_margin_explore.yaml",
+  },
+  {
+    name: "rill-openrtb-prog-ads",
+    title: "OpenRTB Programmatic Ads",
+    description: "Real-time Bidding (RTB) advertising",
+    image: "/img/welcome-bg-openrtb.png",
+    firstFile: "auction_explore.yaml",
+  },
+  {
+    name: "rill-github-analytics",
+    title: "Github Analytics",
+    description: "A Git project's commit activity",
+    image: "/img/welcome-bg-github-analytics.png",
+    firstFile: "duckdb_commits_explore.yaml",
+  },
+];
diff --git a/web-local/tests/init.spec.ts b/web-local/tests/init.spec.ts
new file mode 100644
index 00000000000..f20b3863879
--- /dev/null
+++ b/web-local/tests/init.spec.ts
@@ -0,0 +1,35 @@
+import { test } from "./utils/test";
+import { expect } from "playwright/test";
+import { EXAMPLES } from "@rilldata/web-common/features/welcome/constants";
+
+test.describe("Example project initialization", () => {
+  EXAMPLES.forEach((example) => {
+    test.describe(`Example project: ${example.title}`, () => {
+      test.use({ includeRillYaml: false });
+      test("should initialize new project", async ({ page }) => {
+        await page.getByRole("link", { name: example.title }).click();
+
+        await page.waitForURL(`**/files/dashboards/${example.firstFile}`);
+
+        await expect(
+          page.getByRole("heading", { name: example.firstFile }),
+        ).toBeVisible();
+      });
+    });
+  });
+
+  test.describe("Empty project", () => {
+    test.use({ includeRillYaml: false });
+    test("should initialize new project", async ({ page }) => {
+      await page.getByRole("link", { name: "Empty Project" }).click();
+
+      await expect(page.getByText("Getting started")).toBeVisible();
+
+      await page.getByRole("link", { name: "rill.yaml" }).click();
+
+      await expect(
+        page.getByRole("heading", { name: "rill.yaml" }),
+      ).toBeVisible();
+    });
+  });
+});
diff --git a/web-local/tests/utils/test.ts b/web-local/tests/utils/test.ts
index 994d3aef27b..ac3e0723479 100644
--- a/web-local/tests/utils/test.ts
+++ b/web-local/tests/utils/test.ts
@@ -6,28 +6,33 @@ import { getOpenPort } from "./getOpenPort";
 import { asyncWaitUntil } from "@rilldata/web-common/lib/waitUtils";
 import axios from "axios";
 
+type MyFixtures = {
+  includeRillYaml: boolean;
+};
+
 const BASE_PROJECT_DIRECTORY = "temp/test-project";
 
-export const test = base.extend({
-  page: async ({ page }, use) => {
+export const test = base.extend<MyFixtures>({
+  includeRillYaml: [true, { option: true }],
+
+  page: async ({ page, includeRillYaml }, use) => {
     const TEST_PORT = await getOpenPort();
     const TEST_PORT_GRPC = await getOpenPort();
     const TEST_PROJECT_DIRECTORY = `${BASE_PROJECT_DIRECTORY}-${TEST_PORT}`;
 
-    rmSync(TEST_PROJECT_DIRECTORY, {
-      force: true,
-      recursive: true,
-    });
+    rmSync(TEST_PROJECT_DIRECTORY, { force: true, recursive: true });
 
     if (!existsSync(TEST_PROJECT_DIRECTORY)) {
       mkdirSync(TEST_PROJECT_DIRECTORY, { recursive: true });
     }
 
-    // Add `rill.yaml` file to the project repo
-    writeFileSync(
-      `${TEST_PROJECT_DIRECTORY}/rill.yaml`,
-      'compiler: rill-beta\ntitle: "Test Project"',
-    );
+    // Conditionally write the file
+    if (includeRillYaml) {
+      writeFileSync(
+        `${TEST_PROJECT_DIRECTORY}/rill.yaml`,
+        'compiler: rill-beta\ntitle: "Test Project"',
+      );
+    }
 
     const cmd = `start --no-open --port ${TEST_PORT} --port-grpc ${TEST_PORT_GRPC} ${TEST_PROJECT_DIRECTORY}`;
 

From 993045372a2bb35fe3dcba24c2468e696a902221 Mon Sep 17 00:00:00 2001
From: Anshul Khandelwal <12948312+k-anshul@users.noreply.github.com>
Date: Wed, 29 Jan 2025 10:42:51 +0100
Subject: [PATCH 13/48] fix disk leaks by simplifying reference counting in
 rduckdb catalog (#6522)

---
 runtime/pkg/rduckdb/catalog.go | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/runtime/pkg/rduckdb/catalog.go b/runtime/pkg/rduckdb/catalog.go
index 09ea358cf24..fc405373218 100644
--- a/runtime/pkg/rduckdb/catalog.go
+++ b/runtime/pkg/rduckdb/catalog.go
@@ -51,15 +51,8 @@ func newCatalog(removeVersionFunc func(string, string), removeSnapshotFunc func(
 		logger:             logger,
 	}
 	for _, meta := range tables {
-		c.tables[meta.Name] = &table{
-			name:                   meta.Name,
-			currentVersion:         meta.Version,
-			versionReferenceCounts: map[string]int{},
-			versionMeta:            map[string]*tableMeta{meta.Version: meta},
-		}
-		c.acquireVersion(c.tables[meta.Name], meta.Version)
+		c.addTableVersion(meta.Name, meta)
 	}
-	_ = c.acquireSnapshotUnsafe()
 	return c
 }
 
@@ -104,10 +97,6 @@ func (c *catalog) addTableVersion(name string, meta *tableMeta) {
 	}
 
 	c.currentSnapshotID++
-	c.acquireSnapshotUnsafe()
-	if c.currentSnapshotID > 1 {
-		c.releaseSnapshotUnsafe(c.snapshots[c.currentSnapshotID-1])
-	}
 }
 
 // removeTable removes a table from the catalog.
@@ -128,11 +117,7 @@ func (c *catalog) removeTable(name string) {
 	t.currentVersion = ""
 
 	c.currentSnapshotID++
-	c.acquireSnapshotUnsafe()
 	c.releaseVersion(t, oldVersion)
-	if c.currentSnapshotID > 1 {
-		c.releaseSnapshotUnsafe(c.snapshots[c.currentSnapshotID-1])
-	}
 }
 
 // listTables returns tableMeta for all active tables present in the catalog.
@@ -198,7 +183,7 @@ func (c *catalog) releaseSnapshot(s *snapshot) {
 
 func (c *catalog) releaseSnapshotUnsafe(s *snapshot) {
 	s.referenceCount--
-	if s.referenceCount > 0 {
+	if s.referenceCount > 0 || s.id == c.currentSnapshotID {
 		return
 	}
 
@@ -238,5 +223,9 @@ func (c *catalog) releaseVersion(t *table, version string) {
 	if t.deleted && len(t.versionReferenceCounts) == 0 {
 		delete(c.tables, t.name)
 	}
+	if t.currentVersion == version {
+		// do not remove the current version
+		return
+	}
 	c.removeVersionFunc(t.name, version)
 }

From 1a375ae536369ba48a43059a2cf54e99a1ba038a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Egelund-M=C3=BCller?= <b@egelund-muller.com>
Date: Wed, 29 Jan 2025 09:44:13 +0000
Subject: [PATCH 14/48] Fix unwarranted panic in DeleteMagicAuthTokens (#6516)

---
 admin/database/postgres/postgres.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/database/postgres/postgres.go b/admin/database/postgres/postgres.go
index dffa325650a..16f195dc8f4 100644
--- a/admin/database/postgres/postgres.go
+++ b/admin/database/postgres/postgres.go
@@ -1203,8 +1203,8 @@ func (c *connection) DeleteMagicAuthToken(ctx context.Context, id string) error
 }
 
 func (c *connection) DeleteMagicAuthTokens(ctx context.Context, ids []string) error {
-	res, err := c.getDB(ctx).ExecContext(ctx, "DELETE FROM magic_auth_tokens WHERE id=ANY($1)", ids)
-	return checkDeleteRow("magic auth token", res, err)
+	_, err := c.getDB(ctx).ExecContext(ctx, "DELETE FROM magic_auth_tokens WHERE id=ANY($1)", ids)
+	return parseErr("magic auth token", err)
 }
 
 func (c *connection) DeleteExpiredMagicAuthTokens(ctx context.Context, retention time.Duration) error {

From bfe32a8f65d7840c24fd4dd5012b2e4bc3ca10c4 Mon Sep 17 00:00:00 2001
From: Graham Plata <graham.plata@gmail.com>
Date: Wed, 29 Jan 2025 10:45:50 -0500
Subject: [PATCH 15/48] only admins can skip

---
 runtime/server/controller.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/runtime/server/controller.go b/runtime/server/controller.go
index 1c70711884a..ee3d5a0577e 100644
--- a/runtime/server/controller.go
+++ b/runtime/server/controller.go
@@ -62,6 +62,11 @@ func (s *Server) ListResources(ctx context.Context, req *runtimev1.ListResources
 		return strings.Compare(an.Name, bn.Name)
 	})
 
+	isAdmin := auth.GetClaims(ctx).SecurityClaims().Admin()
+	if isAdmin && req.SkipChecks {
+		return &runtimev1.ListResourcesResponse{Resources: rs}, nil
+	}
+
 	i := 0
 	for i < len(rs) {
 		r := rs[i]
@@ -70,7 +75,7 @@ func (s *Server) ListResources(ctx context.Context, req *runtimev1.ListResources
 			return nil, status.Error(codes.InvalidArgument, err.Error())
 		}
 		// Check of the request is to skip security checks
-		if !req.SkipChecks && !access {
+		if !access {
 			// Remove from the slice
 			rs[i] = rs[len(rs)-1]
 			rs[len(rs)-1] = nil
@@ -177,6 +182,12 @@ func (s *Server) GetResource(ctx context.Context, req *runtimev1.GetResourceRequ
 		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
 
+	isAdmin := auth.GetClaims(ctx).SecurityClaims().Admin()
+
+	if isAdmin && req.SkipChecks {
+		return &runtimev1.GetResourceResponse{Resource: r}, nil
+	}
+
 	r, access, err := s.applySecurityPolicy(ctx, req.InstanceId, r)
 	if err != nil {
 		return nil, status.Error(codes.InvalidArgument, err.Error())

From b7ee295d7e50e3a99d55e7377bc6ecc95a6eae7f Mon Sep 17 00:00:00 2001
From: Anshul Khandelwal <12948312+k-anshul@users.noreply.github.com>
Date: Wed, 29 Jan 2025 17:12:46 +0100
Subject: [PATCH 16/48] fix : Some more disk leaks fixes (#6524)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* more disk leaks fixes

* review comments - always keep current snapshot around

* review comments - always keep current snapshot around

* Update runtime/pkg/rduckdb/catalog.go

Co-authored-by: Benjamin Egelund-Müller <b@egelund-muller.com>

---------

Co-authored-by: Benjamin Egelund-Müller <b@egelund-muller.com>
---
 runtime/pkg/rduckdb/catalog.go | 28 ++++++++++++++++++++++++----
 runtime/pkg/rduckdb/db.go      |  8 ++++----
 runtime/pkg/rduckdb/remote.go  |  4 ++--
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/runtime/pkg/rduckdb/catalog.go b/runtime/pkg/rduckdb/catalog.go
index fc405373218..d6b06b23efb 100644
--- a/runtime/pkg/rduckdb/catalog.go
+++ b/runtime/pkg/rduckdb/catalog.go
@@ -51,8 +51,9 @@ func newCatalog(removeVersionFunc func(string, string), removeSnapshotFunc func(
 		logger:             logger,
 	}
 	for _, meta := range tables {
-		c.addTableVersion(meta.Name, meta)
+		c.addTableVersion(meta.Name, meta, false)
 	}
+	c.incrementSnapshotUnsafe()
 	return c
 }
 
@@ -73,7 +74,7 @@ func (c *catalog) tableMeta(name string) (*tableMeta, error) {
 
 // addTableVersion registers a new version of a table.
 // If the table name has not been seen before, it is added to the catalog.
-func (c *catalog) addTableVersion(name string, meta *tableMeta) {
+func (c *catalog) addTableVersion(name string, meta *tableMeta, incrementSnapshot bool) {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
@@ -96,7 +97,9 @@ func (c *catalog) addTableVersion(name string, meta *tableMeta) {
 		c.releaseVersion(t, oldVersion)
 	}
 
-	c.currentSnapshotID++
+	if incrementSnapshot {
+		c.incrementSnapshotUnsafe()
+	}
 }
 
 // removeTable removes a table from the catalog.
@@ -116,8 +119,8 @@ func (c *catalog) removeTable(name string) {
 	t.deleted = true
 	t.currentVersion = ""
 
-	c.currentSnapshotID++
 	c.releaseVersion(t, oldVersion)
+	c.incrementSnapshotUnsafe()
 }
 
 // listTables returns tableMeta for all active tables present in the catalog.
@@ -139,6 +142,21 @@ func (c *catalog) listTables() []*tableMeta {
 	return tables
 }
 
+// incrementSnapshotUnsafe increments the current snapshot.
+// It ensures that the currentSnapshotID always has at least one reference.
+func (c *catalog) incrementSnapshotUnsafe() {
+	// Increment snapshot ID
+	c.currentSnapshotID++
+
+	// Acquire new current snapshot
+	c.acquireSnapshotUnsafe()
+
+	// Release previous current snapshot
+	if c.currentSnapshotID > 1 {
+		c.releaseSnapshotUnsafe(c.snapshots[c.currentSnapshotID-1])
+	}
+}
+
 // acquireSnapshot acquires a snapshot of the current table versions.
 func (c *catalog) acquireSnapshot() *snapshot {
 	c.mu.Lock()
@@ -158,6 +176,7 @@ func (c *catalog) acquireSnapshotUnsafe() *snapshot {
 		referenceCount: 1,
 		tables:         make([]*tableMeta, 0),
 	}
+
 	for _, t := range c.tables {
 		if t.deleted {
 			continue
@@ -194,6 +213,7 @@ func (c *catalog) releaseSnapshotUnsafe(s *snapshot) {
 		}
 		c.releaseVersion(t, meta.Version)
 	}
+	// delete the older snapshot
 	delete(c.snapshots, s.id)
 	c.removeSnapshotFunc(s.id)
 }
diff --git a/runtime/pkg/rduckdb/db.go b/runtime/pkg/rduckdb/db.go
index b6b898f125c..7a1792165b9 100644
--- a/runtime/pkg/rduckdb/db.go
+++ b/runtime/pkg/rduckdb/db.go
@@ -429,7 +429,7 @@ func (d *db) CreateTableAsSelect(ctx context.Context, name, query string, opts *
 		return nil
 	}
 
-	d.catalog.addTableVersion(name, newMeta)
+	d.catalog.addTableVersion(name, newMeta, true)
 	d.localDirty = false
 	return nil
 }
@@ -507,7 +507,7 @@ func (d *db) MutateTable(ctx context.Context, name string, mutateFn func(ctx con
 		return nil
 	}
 
-	d.catalog.addTableVersion(name, meta)
+	d.catalog.addTableVersion(name, meta, true)
 	d.localDirty = false
 	return nil
 }
@@ -642,7 +642,7 @@ func (d *db) RenameTable(ctx context.Context, oldName, newName string) error {
 
 	// remove old table from local db
 	d.catalog.removeTable(oldName)
-	d.catalog.addTableVersion(newName, meta)
+	d.catalog.addTableVersion(newName, meta, true)
 	d.localDirty = false
 	return nil
 }
@@ -1072,7 +1072,7 @@ func (d *db) removeSnapshot(ctx context.Context, id int) error {
 	}
 	defer d.metaSem.Release(1)
 
-	_, err = d.dbHandle.Exec(fmt.Sprintf("DROP SCHEMA IF EXISTS %s CASCADE", schemaName(id)))
+	_, err = d.dbHandle.ExecContext(ctx, fmt.Sprintf("DROP SCHEMA IF EXISTS %s CASCADE", schemaName(id)))
 	return err
 }
 
diff --git a/runtime/pkg/rduckdb/remote.go b/runtime/pkg/rduckdb/remote.go
index 150c255e588..8802274a309 100644
--- a/runtime/pkg/rduckdb/remote.go
+++ b/runtime/pkg/rduckdb/remote.go
@@ -166,13 +166,13 @@ func (d *db) pullFromRemote(ctx context.Context, updateCatalog bool) error {
 		if err != nil {
 			if errors.Is(err, errNotFound) {
 				// table not found in catalog
-				d.catalog.addTableVersion(table, remoteMeta)
+				d.catalog.addTableVersion(table, remoteMeta, true)
 			}
 			return err
 		}
 		// table is present in catalog but has version mismatch
 		if meta.Version != remoteMeta.Version {
-			d.catalog.addTableVersion(table, remoteMeta)
+			d.catalog.addTableVersion(table, remoteMeta, true)
 		}
 	}
 

From 8bf7a5ec1c7f146a704922795adabbac5bf82eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Egelund-M=C3=BCller?= <b@egelund-muller.com>
Date: Wed, 29 Jan 2025 17:35:28 +0100
Subject: [PATCH 17/48] Lazy evaluation of timestamps for metrics queries
 (#6526)

---
 runtime/metricsview/executor.go              |  2 +
 runtime/metricsview/executor_rewrite_time.go | 55 ++++++++-------
 runtime/metricsview/executor_timestamps.go   | 72 ++++++++++----------
 3 files changed, 68 insertions(+), 61 deletions(-)

diff --git a/runtime/metricsview/executor.go b/runtime/metricsview/executor.go
index ab26de1f6f1..5fa5229dbd4 100644
--- a/runtime/metricsview/executor.go
+++ b/runtime/metricsview/executor.go
@@ -42,6 +42,7 @@ type TimestampsResult struct {
 	Min       time.Time
 	Max       time.Time
 	Watermark time.Time
+	Now       time.Time
 }
 
 // NewExecutor creates a new Executor for the provided metrics view.
@@ -152,6 +153,7 @@ func (e *Executor) Timestamps(ctx context.Context) (TimestampsResult, error) {
 		return TimestampsResult{}, err
 	}
 
+	e.timestamps.Now = time.Now()
 	return e.timestamps, nil
 }
 
diff --git a/runtime/metricsview/executor_rewrite_time.go b/runtime/metricsview/executor_rewrite_time.go
index 19cfb3b130e..c02524ff424 100644
--- a/runtime/metricsview/executor_rewrite_time.go
+++ b/runtime/metricsview/executor_rewrite_time.go
@@ -17,11 +17,6 @@ func (e *Executor) rewriteQueryTimeRanges(ctx context.Context, qry *Query, execu
 		return nil
 	}
 
-	ts, err := e.Timestamps(ctx)
-	if err != nil {
-		return fmt.Errorf("failed to fetch timestamps: %w", err)
-	}
-
 	tz := time.UTC
 	if qry.TimeZone != "" {
 		var err error
@@ -31,22 +26,12 @@ func (e *Executor) rewriteQueryTimeRanges(ctx context.Context, qry *Query, execu
 		}
 	}
 
-	maxTime := ts.Max
-	watermark := ts.Watermark
-	now := time.Now()
-	if executionTime != nil {
-		// all end anchors should use execution time when provided
-		maxTime = *executionTime
-		watermark = *executionTime
-		now = *executionTime
-	}
-
-	err = e.resolveTimeRange(qry.TimeRange, tz, ts.Min, maxTime, watermark, now)
+	err := e.resolveTimeRange(ctx, qry.TimeRange, tz, executionTime)
 	if err != nil {
 		return fmt.Errorf("failed to resolve time range: %w", err)
 	}
 
-	err = e.resolveTimeRange(qry.ComparisonTimeRange, tz, ts.Min, maxTime, watermark, now)
+	err = e.resolveTimeRange(ctx, qry.ComparisonTimeRange, tz, executionTime)
 	if err != nil {
 		return fmt.Errorf("failed to resolve comparison time range: %w", err)
 	}
@@ -55,28 +40,40 @@ func (e *Executor) rewriteQueryTimeRanges(ctx context.Context, qry *Query, execu
 }
 
 // resolveTimeRange resolves the given time range, ensuring only its Start and End properties are populated.
-func (e *Executor) resolveTimeRange(tr *TimeRange, tz *time.Location, minTime, maxTime, watermark, now time.Time) error {
+func (e *Executor) resolveTimeRange(ctx context.Context, tr *TimeRange, tz *time.Location, executionTime *time.Time) error {
 	if tr == nil || tr.IsZero() {
 		return nil
 	}
 
 	if tr.Expression == "" {
-		return e.resolveISOTimeRange(tr, tz, watermark)
+		return e.resolveISOTimeRange(ctx, tr, tz, executionTime)
 	}
 	if !tr.Start.IsZero() || !tr.End.IsZero() || tr.IsoDuration != "" || tr.IsoOffset != "" || tr.RoundToGrain != TimeGrainUnspecified {
 		return errors.New("other fields are not supported when expression is provided")
 	}
 
+	// TODO: Implement lazy evaluation where we only evaluate timestamps if required for the time expression.
+	ts, err := e.Timestamps(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to fetch timestamps: %w", err)
+	}
+	if executionTime != nil {
+		// If provided, all the end anchors should use the execution time.
+		ts.Watermark = *executionTime
+		ts.Max = *executionTime
+		ts.Now = *executionTime
+	}
+
 	rillTime, err := rilltime.Parse(tr.Expression, rilltime.ParseOptions{})
 	if err != nil {
 		return err
 	}
 
 	tr.Start, tr.End, err = rillTime.Eval(rilltime.EvalOptions{
-		Now:        now,
-		MinTime:    minTime,
-		MaxTime:    maxTime,
-		Watermark:  watermark,
+		Now:        ts.Now,
+		MinTime:    ts.Min,
+		MaxTime:    ts.Max,
+		Watermark:  ts.Watermark,
 		FirstDay:   int(e.metricsView.FirstDayOfWeek),
 		FirstMonth: int(e.metricsView.FirstMonthOfYear),
 	})
@@ -94,9 +91,17 @@ func (e *Executor) resolveTimeRange(tr *TimeRange, tz *time.Location, minTime, m
 }
 
 // resolveISOTimeRange resolves the given time range where either only start/end is specified along with ISO duration/offset, ensuring only its Start and End properties are populated.
-func (e *Executor) resolveISOTimeRange(tr *TimeRange, tz *time.Location, watermark time.Time) error {
+func (e *Executor) resolveISOTimeRange(ctx context.Context, tr *TimeRange, tz *time.Location, executionTime *time.Time) error {
 	if tr.Start.IsZero() && tr.End.IsZero() {
-		tr.End = watermark
+		if executionTime == nil {
+			ts, err := e.Timestamps(ctx)
+			if err != nil {
+				return fmt.Errorf("failed to fetch timestamps: %w", err)
+			}
+			executionTime = &ts.Watermark
+		}
+
+		tr.End = *executionTime
 	}
 
 	var isISO bool
diff --git a/runtime/metricsview/executor_timestamps.go b/runtime/metricsview/executor_timestamps.go
index e716156f9b3..1a1e4923db7 100644
--- a/runtime/metricsview/executor_timestamps.go
+++ b/runtime/metricsview/executor_timestamps.go
@@ -26,7 +26,7 @@ func (e *Executor) resolveDuckDBClickHouseAndPinot(ctx context.Context) (Timesta
 	if e.metricsView.WatermarkExpression != "" {
 		watermarkExpr = e.metricsView.WatermarkExpression
 	} else {
-		watermarkExpr = fmt.Sprintf("MAX(%s)", timeDim)
+		watermarkExpr = fmt.Sprintf("max(%s)", timeDim)
 	}
 
 	rangeSQL := fmt.Sprintf(
@@ -146,51 +146,51 @@ func (e *Executor) resolveDruid(ctx context.Context) (TimestampsResult, error) {
 		return nil
 	})
 
-	group.Go(func() error {
-		var watermarkExpr string
-		if e.metricsView.WatermarkExpression != "" {
-			watermarkExpr = e.metricsView.WatermarkExpression
-		} else {
-			watermarkExpr = fmt.Sprintf("MAX(%s)", timeDim)
-		}
-
-		maxSQL := fmt.Sprintf(
-			"SELECT %[1]s as \"watermark\" FROM %[2]s %[3]s",
-			watermarkExpr,
-			escapedTableName,
-			filter,
-		)
-
-		rows, err := e.olap.Execute(ctx, &drivers.Statement{
-			Query:            maxSQL,
-			Priority:         e.priority,
-			ExecutionTimeout: defaultExecutionTimeout,
-		})
-		if err != nil {
-			return err
-		}
-		defer rows.Close()
-
-		if rows.Next() {
-			err = rows.Scan(&ts.Watermark)
+	if e.metricsView.WatermarkExpression != "" {
+		group.Go(func() error {
+			maxSQL := fmt.Sprintf(
+				"SELECT %[1]s as \"watermark\" FROM %[2]s %[3]s",
+				e.metricsView.WatermarkExpression,
+				escapedTableName,
+				filter,
+			)
+
+			rows, err := e.olap.Execute(ctx, &drivers.Statement{
+				Query:            maxSQL,
+				Priority:         e.priority,
+				ExecutionTimeout: defaultExecutionTimeout,
+			})
 			if err != nil {
 				return err
 			}
-		} else {
-			err = rows.Err()
-			if err != nil {
-				return err
+			defer rows.Close()
+
+			if rows.Next() {
+				err = rows.Scan(&ts.Watermark)
+				if err != nil {
+					return err
+				}
+			} else {
+				err = rows.Err()
+				if err != nil {
+					return err
+				}
+				return errors.New("no rows returned for max time")
 			}
-			return errors.New("no rows returned for max time")
-		}
-		return nil
-	})
+			return nil
+		})
+	}
 
 	err := group.Wait()
 	if err != nil {
 		return TimestampsResult{}, err
 	}
 
+	// If there's no custom watermark expression, the watermark defaults to the max time.
+	if e.metricsView.WatermarkExpression == "" {
+		ts.Watermark = ts.Max
+	}
+
 	return ts, nil
 }
 

From c28ac005f934bdc72e233ae58c30b1f6b27d0844 Mon Sep 17 00:00:00 2001
From: Anshul Khandelwal <12948312+k-anshul@users.noreply.github.com>
Date: Wed, 29 Jan 2025 19:34:07 +0100
Subject: [PATCH 18/48] fix : Avoid hard dependencies on github (#6527)

* don't delete projects if github installation is removed

* lint fixes

* lint fixes
---
 admin/github.go | 40 ++++------------------------------------
 1 file changed, 4 insertions(+), 36 deletions(-)

diff --git a/admin/github.go b/admin/github.go
index 5adc499414f..96da0c5f57a 100644
--- a/admin/github.go
+++ b/admin/github.go
@@ -255,22 +255,15 @@ func (s *Service) processGithubInstallationEvent(ctx context.Context, event *git
 	return nil
 }
 
-func (s *Service) processGithubInstallationRepositoriesEvent(ctx context.Context, event *github.InstallationRepositoriesEvent) error {
+func (s *Service) processGithubInstallationRepositoriesEvent(_ context.Context, event *github.InstallationRepositoriesEvent) error {
 	// We can access event.RepositoriesAdded and event.RepositoriesRemoved
 	switch event.GetAction() {
 	case "added":
 		// no handling as of now
 	case "removed":
-		var multiErr error
-		s.Logger.Info("github webhook: processing removed repositories", observability.ZapCtx(ctx))
-		for _, repo := range event.RepositoriesRemoved {
-			if err := s.deleteProjectsForRepo(ctx, repo); err != nil {
-				multiErr = multierr.Combine(multiErr, err)
-				s.Logger.Error("github webhook: failed to delete projects for repo", zap.String("repo", *repo.HTMLURL), zap.Error(err), observability.ZapCtx(ctx))
-			}
-		}
-		s.Logger.Info("github webhook: processing removed repositories completed", observability.ZapCtx(ctx))
-		return multiErr
+		// no handling as of now
+		// previously we were deleting the project for the repo
+		// but that means if there is an accidental removal we delete all projects
 	}
 	return nil
 }
@@ -292,28 +285,3 @@ func (s *Service) deleteProjectsForInstallation(ctx context.Context, id int64) e
 	}
 	return multiErr
 }
-
-func (s *Service) deleteProjectsForRepo(ctx context.Context, repo *github.Repository) error {
-	// Find Rill project matching the repo that was pushed to
-	projects, err := s.DB.FindProjectsByGithubURL(ctx, githubURLFromRepo(repo))
-	if err != nil {
-		return err
-	}
-
-	var multiErr error
-	for _, p := range projects {
-		err := s.TeardownProject(ctx, p)
-		if err != nil {
-			multiErr = multierr.Combine(multiErr, fmt.Errorf("unable to delete project %q: %w", p.ID, err))
-			continue
-		}
-	}
-	return multiErr
-}
-
-func githubURLFromRepo(repo *github.Repository) string {
-	if repo.HTMLURL != nil {
-		return *repo.HTMLURL
-	}
-	return "https://github.com/" + repo.GetFullName()
-}

From 8aa919851b35f3d9fdb3c805bea2a0335e51cc56 Mon Sep 17 00:00:00 2001
From: Cyrus Goh <hello@cyrusgoh.com>
Date: Wed, 29 Jan 2025 12:22:42 -0800
Subject: [PATCH 19/48] Set max date for public url form (#6513)

* override max date in public url form

* revert

* feedback
---
 .../features/dashboards/share/ShareDashboardPopover.svelte | 7 ++++++-
 .../src/features/public-urls/CreatePublicURLForm.svelte    | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/web-admin/src/features/dashboards/share/ShareDashboardPopover.svelte b/web-admin/src/features/dashboards/share/ShareDashboardPopover.svelte
index cbf13520498..f2477161fa1 100644
--- a/web-admin/src/features/dashboards/share/ShareDashboardPopover.svelte
+++ b/web-admin/src/features/dashboards/share/ShareDashboardPopover.svelte
@@ -30,7 +30,12 @@
   }
 </script>
 
-<Popover bind:open={isOpen}>
+<Popover
+  bind:open={isOpen}
+  onOutsideClick={() => {
+    isOpen = false;
+  }}
+>
   <PopoverTrigger asChild let:builder>
     <Button type="secondary" builders={[builder]} selected={isOpen}
       >Share</Button
diff --git a/web-admin/src/features/public-urls/CreatePublicURLForm.svelte b/web-admin/src/features/public-urls/CreatePublicURLForm.svelte
index e327441201e..da50f0fa0c1 100644
--- a/web-admin/src/features/public-urls/CreatePublicURLForm.svelte
+++ b/web-admin/src/features/public-urls/CreatePublicURLForm.svelte
@@ -136,13 +136,16 @@
   $: if (setExpiration && $form.expiresAt === null) {
     // When `setExpiration` is toggled, initialize the expiration time to 60 days from today
     $form.expiresAt = DateTime.now().plus({ days: 60 }).toISO();
+    popoverOpen = true;
   } else if (!setExpiration) {
     $form.expiresAt = null;
+    popoverOpen = false;
   }
 
   $: ({ length: allErrorsLength } = $allErrors);
 
   $: includingTomorrowDate = DateTime.now().plus({ days: 1 }).startOf("day");
+  $: maxExpirationDate = DateTime.now().plus({ years: 1 }).startOf("day");
 </script>
 
 {#if !url}
@@ -187,6 +190,7 @@
                   selection={DateTime.fromISO($form.expiresAt)}
                   singleDaySelection
                   minDate={includingTomorrowDate}
+                  maxDate={maxExpirationDate}
                   firstVisibleMonth={DateTime.fromISO($form.expiresAt)}
                   onSelectDay={(date) => {
                     $form.expiresAt = date.toISO();

From 4821496e7aa25691bbf8a6c84bbd40c30d9efb75 Mon Sep 17 00:00:00 2001
From: Aditya Hegde <adityahegderocks@gmail.com>
Date: Thu, 30 Jan 2025 08:40:46 +0530
Subject: [PATCH 20/48] fix: rill time issues around truncate and arithmatic
 (#6509)

* Fix anchor arithmatic being truncated

* Fix invalid firstMonth in timeutil.Truncate

* Fix lint

* Add absolute at modifier time support
---
 runtime/pkg/rilltime/rilltime.go      | 112 ++++++++++++++++----------
 runtime/pkg/rilltime/rilltime_test.go |  44 +++++++---
 runtime/pkg/timeutil/timeutil.go      |   7 ++
 runtime/pkg/timeutil/timeutil_test.go |   4 +
 4 files changed, 113 insertions(+), 54 deletions(-)

diff --git a/runtime/pkg/rilltime/rilltime.go b/runtime/pkg/rilltime/rilltime.go
index 158da327756..eadf37add5e 100644
--- a/runtime/pkg/rilltime/rilltime.go
+++ b/runtime/pkg/rilltime/rilltime.go
@@ -22,7 +22,7 @@ var (
 		{"Latest", "latest"},
 		{"Watermark", "watermark"},
 		// this needs to be after Now and Latest to match to them
-		{"Grain", `[smhdDWQMY]`},
+		{"Grain", `[sSmhHdDwWqQMyY]`},
 		// this has to be at the end
 		{"TimeZone", `{.+?}`},
 		{"AbsoluteTime", `\d{4}-\d{2}-\d{2} \d{2}:\d{2}`},
@@ -58,13 +58,18 @@ var (
 	)
 	grainMap = map[string]timeutil.TimeGrain{
 		"s": timeutil.TimeGrainSecond,
+		"S": timeutil.TimeGrainSecond,
 		"m": timeutil.TimeGrainMinute,
 		"h": timeutil.TimeGrainHour,
+		"H": timeutil.TimeGrainHour,
 		"d": timeutil.TimeGrainDay,
 		"D": timeutil.TimeGrainDay,
+		"w": timeutil.TimeGrainWeek,
 		"W": timeutil.TimeGrainWeek,
+		"q": timeutil.TimeGrainQuarter,
 		"Q": timeutil.TimeGrainQuarter,
 		"M": timeutil.TimeGrainMonth,
+		"y": timeutil.TimeGrainYear,
 		"Y": timeutil.TimeGrainYear,
 	}
 )
@@ -89,8 +94,8 @@ type TimeAnchor struct {
 	Now         bool    `parser:"| @Now"`
 	Latest      bool    `parser:"| @Latest"`
 	Watermark   bool    `parser:"| @Watermark)"`
-	Offset      *Grain  `parser:"@@?"`
 	Trunc       *string `parser:"  ('/' @Grain)?"`
+	Offset      *Grain  `parser:"@@?"`
 	isoDuration *duration.StandardDuration
 }
 
@@ -105,8 +110,8 @@ type Grain struct {
 }
 
 type AtModifiers struct {
-	Offset   *Grain  `parser:"@@?"`
-	TimeZone *string `parser:"@TimeZone?"`
+	AnchorOverride *TimeAnchor `parser:"@@?"`
+	TimeZone       *string     `parser:"@TimeZone?"`
 }
 
 // ParseOptions allows for additional options that could probably not be added to the time range itself
@@ -164,12 +169,6 @@ func Parse(from string, parseOpts ParseOptions) (*Expression, error) {
 		}
 	}
 
-	if rt.End == nil {
-		rt.End = &TimeAnchor{
-			Watermark: true,
-		}
-	}
-
 	return rt, nil
 }
 
@@ -196,25 +195,18 @@ func ParseCompatibility(timeRange, offset string) error {
 }
 
 func (e *Expression) Eval(evalOpts EvalOptions) (time.Time, time.Time, error) {
-	start := evalOpts.Watermark
-	if e.End != nil {
-		if e.End.Latest {
-			// if end has latest mentioned then start also should be relative to latest.
-			start = evalOpts.MaxTime
-		} else if e.End.Now {
-			// if end has now mentioned then start also should be relative to latest.
-			start = evalOpts.Now
-		}
-	}
+	anchor, fallbackEndAnchor := e.getAnchor(evalOpts)
 
+	start := anchor
 	if e.Start != nil {
-		start = e.modify(evalOpts, e.Start, start)
+		start = e.modify(evalOpts, e.Start, anchor)
 	}
 
-	end := evalOpts.Watermark
-	if e.End != nil {
-		end = e.modify(evalOpts, e.End, end)
+	endAnchor := e.End
+	if e.End == nil {
+		endAnchor = fallbackEndAnchor
 	}
+	end := e.modify(evalOpts, endAnchor, anchor)
 
 	return start, end, nil
 }
@@ -261,11 +253,6 @@ func (e *Expression) modify(evalOpts EvalOptions, ta *TimeAnchor, tm time.Time)
 		return tm.In(e.timeZone)
 	}
 
-	timeBeforeOffset := tm
-	if ta.Offset != nil {
-		tm = ta.Offset.offset(tm)
-	}
-
 	if ta.Trunc != nil {
 		truncateGrain = grainMap[*ta.Trunc]
 		isTruncate = true
@@ -278,12 +265,19 @@ func (e *Expression) modify(evalOpts EvalOptions, ta *TimeAnchor, tm time.Time)
 		modifiedTime = timeutil.CeilTime(tm, truncateGrain, e.timeZone, evalOpts.FirstDay, evalOpts.FirstMonth)
 	}
 
-	// Add offset after truncate
-	if e.AtModifiers != nil && e.AtModifiers.Offset != nil {
-		modifiedTime = e.AtModifiers.Offset.offset(modifiedTime)
+	// Add local offset after truncate. This allows for `0W+1D`
+	if ta.Offset != nil {
+		modifiedTime = ta.Offset.offset(modifiedTime)
+		modifiedTime = timeutil.TruncateTime(modifiedTime, grainMap[ta.Offset.Grain], e.timeZone, evalOpts.FirstDay, evalOpts.FirstMonth)
 	}
 
-	if isBoundary && modifiedTime.Equal(timeBeforeOffset) && (e.Modifiers == nil || e.Modifiers.CompleteGrain == nil) {
+	// Add global offset from AtModifiers after truncate
+	// Only grain offset is applied here. Anchor offsets like `@ now` or `@ latest` are applied to `tm` param
+	if e.AtModifiers != nil && e.AtModifiers.AnchorOverride != nil && e.AtModifiers.AnchorOverride.Grain != nil {
+		modifiedTime = e.AtModifiers.AnchorOverride.Grain.offset(modifiedTime)
+	}
+
+	if isBoundary && modifiedTime.Equal(tm) && (e.Modifiers == nil || e.Modifiers.CompleteGrain == nil) {
 		// edge case where the end time falls on a boundary. add +1grain to make sure the last data point is included
 		n := 1
 		g := &Grain{
@@ -299,6 +293,44 @@ func (e *Expression) modify(evalOpts EvalOptions, ta *TimeAnchor, tm time.Time)
 	return modifiedTime
 }
 
+func (e *Expression) getAnchor(evalOpts EvalOptions) (time.Time, *TimeAnchor) {
+	if e.AtModifiers != nil && e.AtModifiers.AnchorOverride != nil {
+		if e.AtModifiers.AnchorOverride.Now {
+			return evalOpts.Now, e.AtModifiers.AnchorOverride
+		}
+		if e.AtModifiers.AnchorOverride.Latest {
+			return evalOpts.MaxTime, e.AtModifiers.AnchorOverride
+		}
+		if e.AtModifiers.AnchorOverride.Earliest {
+			return evalOpts.MinTime, e.AtModifiers.AnchorOverride
+		}
+		if e.AtModifiers.AnchorOverride.AbsDate != nil {
+			absTm, _ := time.Parse(time.DateOnly, *e.AtModifiers.AnchorOverride.AbsDate)
+			return absTm, e.AtModifiers.AnchorOverride
+		}
+		if e.AtModifiers.AnchorOverride.AbsTime != nil {
+			absTm, _ := time.Parse("2006-01-02 15:04", *e.AtModifiers.AnchorOverride.AbsTime)
+			return absTm, e.AtModifiers.AnchorOverride
+		}
+	}
+
+	if e.End == nil {
+		return evalOpts.Watermark, &TimeAnchor{
+			Watermark: true,
+		}
+	}
+
+	if e.End.Latest {
+		// if end has latest mentioned then start also should be relative to latest.
+		return evalOpts.MaxTime, e.End
+	}
+	if e.End.Now {
+		// if end has now mentioned then start also should be relative to latest.
+		return evalOpts.Now, e.End
+	}
+	return evalOpts.Watermark, e.End
+}
+
 func parseISO(from string, parseOpts ParseOptions) (*Expression, error) {
 	// Try parsing for "inf"
 	if infPattern.MatchString(from) {
@@ -354,23 +386,21 @@ func (g *Grain) offset(tm time.Time) time.Time {
 	}
 
 	switch g.Grain {
-	case "s":
+	case "s", "S":
 		tm = tm.Add(time.Duration(n) * time.Second)
 	case "m":
 		tm = tm.Add(time.Duration(n) * time.Minute)
-	case "h":
+	case "h", "H":
 		tm = tm.Add(time.Duration(n) * time.Hour)
-	case "d":
-		tm = tm.AddDate(0, 0, n)
-	case "D":
+	case "d", "D":
 		tm = tm.AddDate(0, 0, n)
-	case "W":
+	case "W", "w":
 		tm = tm.AddDate(0, 0, n*7)
 	case "M":
 		tm = tm.AddDate(0, n, 0)
-	case "Q":
+	case "Q", "q":
 		tm = tm.AddDate(0, n*3, 0)
-	case "Y":
+	case "Y", "y":
 		tm = tm.AddDate(n, 0, 0)
 	}
 
diff --git a/runtime/pkg/rilltime/rilltime_test.go b/runtime/pkg/rilltime/rilltime_test.go
index 5e66507e837..27a2aec416b 100644
--- a/runtime/pkg/rilltime/rilltime_test.go
+++ b/runtime/pkg/rilltime/rilltime_test.go
@@ -8,7 +8,8 @@ import (
 )
 
 func Test_Resolve(t *testing.T) {
-	now := parseTestTime(t, "2024-08-09T10:32:36Z")
+	now := parseTestTime(t, "2024-08-16T10:32:36Z")
+	minTime := parseTestTime(t, "2024-01-01T00:32:36Z")
 	maxTime := parseTestTime(t, "2024-08-06T06:32:36Z")
 	watermark := parseTestTime(t, "2024-08-05T06:32:36Z")
 	testCases := []struct {
@@ -23,22 +24,30 @@ func Test_Resolve(t *testing.T) {
 		{`-5m, 0m : |m|`, "2024-08-05T06:27:00Z", "2024-08-05T06:32:00Z"},
 		{`h : m`, "2024-08-05T06:00:00Z", "2024-08-05T06:33:00Z"},
 		{`-7d, 0d : |h|`, "2024-07-29T00:00:00Z", "2024-08-05T00:00:00Z"},
-		{`-7d, now/d : |h|`, "2024-08-02T00:00:00Z", "2024-08-09T00:00:00Z"},
-		{`-6d, now : |h|`, "2024-08-03T00:00:00Z", "2024-08-09T10:00:00Z"},
-		{`-6d, now : h`, "2024-08-03T00:00:00Z", "2024-08-09T11:00:00Z"},
+		{`-7d, now/d : |h|`, "2024-08-09T00:00:00Z", "2024-08-16T00:00:00Z"},
+		{`-6d, now : |h|`, "2024-08-10T00:00:00Z", "2024-08-16T10:00:00Z"},
+		{`-6d, now : h`, "2024-08-10T00:00:00Z", "2024-08-16T11:00:00Z"},
+
+		{`0Y, now @ {UTC}`, "2024-01-01T00:00:00Z", "2024-08-16T10:32:37Z"},
+		{`0Y, latest @ {UTC}`, "2024-01-01T00:00:00Z", "2024-08-06T06:32:37Z"},
+		{`0Y, watermark @ {UTC}`, "2024-01-01T00:00:00Z", "2024-08-05T06:32:37Z"},
+		{`0y, watermark @ {UTC}`, "2024-01-01T00:00:00Z", "2024-08-05T06:32:37Z"},
 
 		{`0d : h`, "2024-08-05T00:00:00Z", "2024-08-05T07:00:00Z"},
 		{`0d : h @ -1d`, "2024-08-04T00:00:00Z", "2024-08-04T07:00:00Z"},
+		{`0d : h @ now`, "2024-08-16T00:00:00Z", "2024-08-16T11:00:00Z"},
 
 		{`-7d, -5d : h`, "2024-07-29T00:00:00Z", "2024-07-31T00:00:00Z"},
-		{`-2d, now/d : h @ -5d`, "2024-08-02T00:00:00Z", "2024-08-04T00:00:00Z"},
-		{`-2d, now/d @ -5d`, "2024-08-02T00:00:00Z", "2024-08-04T00:00:00Z"},
+		{`watermark-7d, watermark-5d : h`, "2024-07-29T00:00:00Z", "2024-07-31T00:00:00Z"},
+		{`-2d, now/d : h @ -5d`, "2024-08-09T00:00:00Z", "2024-08-11T00:00:00Z"},
+		{`-2d, now/d @ -5d`, "2024-08-09T00:00:00Z", "2024-08-11T00:00:00Z"},
+		{`-7d, -5d @ now`, "2024-08-09T00:00:00Z", "2024-08-11T00:00:00Z"},
 
-		{`watermark-7D, watermark : h`, "2024-07-29T07:00:00Z", "2024-08-05T07:00:00Z"},
+		{`watermark-7D, watermark : h`, "2024-07-29T00:00:00Z", "2024-08-05T07:00:00Z"},
 
-		{`-7d, now/d : h @ {Asia/Kathmandu}`, "2024-08-01T18:15:00Z", "2024-08-08T18:15:00Z"},
-		{`-7d, now/d : |h| @ {Asia/Kathmandu}`, "2024-08-01T18:15:00Z", "2024-08-08T18:15:00Z"},
-		{`-7d, now/d : |h| @ -5d {Asia/Kathmandu}`, "2024-07-27T18:15:00Z", "2024-08-03T18:15:00Z"},
+		{`-7d, now/d : h @ {Asia/Kathmandu}`, "2024-08-08T18:15:00Z", "2024-08-15T18:15:00Z"},
+		{`-7d, now/d : |h| @ {Asia/Kathmandu}`, "2024-08-08T18:15:00Z", "2024-08-15T18:15:00Z"},
+		{`-7d, now/d : |h| @ -5d {Asia/Kathmandu}`, "2024-08-03T18:15:00Z", "2024-08-10T18:15:00Z"},
 
 		{`-7d, latest/d : |h|`, "2024-07-30T00:00:00Z", "2024-08-06T00:00:00Z"},
 		{`-6d, latest : |h|`, "2024-07-31T00:00:00Z", "2024-08-06T06:00:00Z"},
@@ -50,8 +59,17 @@ func Test_Resolve(t *testing.T) {
 		{`2024-01-01 12:00, latest : h`, "2024-01-01T12:00:00Z", "2024-08-06T07:00:00Z"},
 
 		{`2024-01-01+5d, latest : h`, "2024-01-06T00:00:00Z", "2024-08-06T07:00:00Z"},
-		{`-7W+5d, latest : h`, "2024-06-17T00:00:00Z", "2024-08-06T07:00:00Z"},
-		{`-7W+8d, latest : h`, "2024-06-24T00:00:00Z", "2024-08-06T07:00:00Z"},
+		{`-7W+5d, latest : h`, "2024-06-22T00:00:00Z", "2024-08-06T07:00:00Z"},
+		{`-7w+5D, latest : h`, "2024-06-22T00:00:00Z", "2024-08-06T07:00:00Z"},
+		{`-7W+8d, latest : h`, "2024-06-25T00:00:00Z", "2024-08-06T07:00:00Z"},
+
+		{`0W, 0W+1D`, "2024-08-05T00:00:00Z", "2024-08-06T00:00:00Z"},
+		{`watermark/W, watermark/W+1D`, "2024-08-05T00:00:00Z", "2024-08-06T00:00:00Z"},
+		{`0W, 0W+1D @ latest`, "2024-08-05T00:00:00Z", "2024-08-06T00:00:00Z"},
+		{`0W, 0W+1D @ now`, "2024-08-12T00:00:00Z", "2024-08-13T00:00:00Z"},
+		{`now/W, now/W+1D`, "2024-08-12T00:00:00Z", "2024-08-13T00:00:00Z"},
+		{`0W, 0W+1D @ 2024-02-08`, "2024-02-05T00:00:00Z", "2024-02-06T00:00:00Z"},
+		{`0D, 0D+5H @ 2024-02-08 21:34`, "2024-02-08T00:00:00Z", "2024-02-08T05:00:00Z"},
 
 		{"P2DT10H", "2024-08-03T20:00:00Z", "2024-08-06T07:32:36Z"},
 		{"rill-MTD", "2024-08-01T00:00:00Z", "2024-08-06T06:32:37Z"},
@@ -65,7 +83,7 @@ func Test_Resolve(t *testing.T) {
 
 			start, end, err := rillTime.Eval(EvalOptions{
 				Now:        now,
-				MinTime:    now.AddDate(-1, 0, 0),
+				MinTime:    minTime,
 				MaxTime:    maxTime,
 				Watermark:  watermark,
 				FirstDay:   1,
diff --git a/runtime/pkg/timeutil/timeutil.go b/runtime/pkg/timeutil/timeutil.go
index 5fff1d60bdf..eaebee54218 100644
--- a/runtime/pkg/timeutil/timeutil.go
+++ b/runtime/pkg/timeutil/timeutil.go
@@ -79,6 +79,13 @@ func TruncateTime(start time.Time, tg TimeGrain, tz *time.Location, firstDay, fi
 		start = start.AddDate(0, -monthsToSubtract, 0)
 		return start.In(time.UTC)
 	case TimeGrainYear:
+		if firstMonth < 1 {
+			firstMonth = 1
+		}
+		if firstMonth > 12 {
+			firstMonth = 12
+		}
+
 		start = start.In(tz)
 		year := start.Year()
 		if int(start.Month()) < firstMonth {
diff --git a/runtime/pkg/timeutil/timeutil_test.go b/runtime/pkg/timeutil/timeutil_test.go
index 7804bf90286..56fa38623a1 100644
--- a/runtime/pkg/timeutil/timeutil_test.go
+++ b/runtime/pkg/timeutil/timeutil_test.go
@@ -83,6 +83,10 @@ func TestTruncateTime_UTC_first_month(t *testing.T) {
 	require.Equal(t, parseTestTime(t, "2023-03-01T00:00:00Z"), TruncateTime(parseTestTime(t, "2023-03-01T00:20:00Z"), TimeGrainYear, tz, 2, 3))
 	require.Equal(t, parseTestTime(t, "2022-12-01T00:00:00Z"), TruncateTime(parseTestTime(t, "2023-10-01T00:20:00Z"), TimeGrainYear, tz, 2, 12))
 	require.Equal(t, parseTestTime(t, "2023-01-01T00:00:00Z"), TruncateTime(parseTestTime(t, "2023-01-01T00:20:00Z"), TimeGrainYear, tz, 2, 1))
+
+	// Invalid firstMonth
+	require.Equal(t, parseTestTime(t, "2023-01-01T00:00:00Z"), TruncateTime(parseTestTime(t, "2023-01-01T00:20:00Z"), TimeGrainYear, tz, 2, 0))
+	require.Equal(t, parseTestTime(t, "2022-12-01T00:00:00Z"), TruncateTime(parseTestTime(t, "2023-10-01T00:20:00Z"), TimeGrainYear, tz, 2, 13))
 }
 
 func TestTruncateTime_Kathmandu_first_month(t *testing.T) {

From 9ba4d262183d687448e6e8436103b501f23f95a4 Mon Sep 17 00:00:00 2001
From: Alexander Thor <alec.karlsson@gmail.com>
Date: Thu, 30 Jan 2025 09:56:39 +0100
Subject: [PATCH 21/48] docs: release notes 0.54 (#6532)

* Create 0.54.md

* Update 0.54.md

* Not many commits to 0.54 from 53

* docs: add features

* fix: nits

---------

Co-authored-by: royendo <67675319+royendo@users.noreply.github.com>
---
 docs/blog/0.54.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 docs/blog/0.54.md

diff --git a/docs/blog/0.54.md b/docs/blog/0.54.md
new file mode 100644
index 00000000000..a5a85f59a9e
--- /dev/null
+++ b/docs/blog/0.54.md
@@ -0,0 +1,30 @@
+---
+
+date: 2025-01-30
+image: https://github.com/rilldata/rill/assets/5587788/b30486f6-002a-445d-8a1b-955b6ec0066d
+
+---
+
+# Rill 0.54 - Bug fixes, pushing envs on deploy and many small improvements
+
+:::note
+⚡ Rill Developer is a tool that makes it effortless to transform your datasets with SQL and create fast, exploratory dashboards. Rill Cloud can then help to enable shared collaboration at scale.
+
+To [try out Rill Developer, check out these instructions](/home/install) and [join us over on Discord](https://bit.ly/3bbcSl9) to meet the team behind the product as well as other users. In addition, once you have a project set up in Rill Developer, you can then [deploy the project](/deploy/deploy-dashboard) and collaborate with others / invite your team members by [logging into Rill Cloud](https://ui.rilldata.com)!
+:::
+
+## Pushing envs on deploy
+Rill Developer now ensures that any local .envs are automatically pushed whenever you `rill deploy` to ensure that no credentials are left behind!
+
+## Bug fixes and small improvements
+Many bug fixes and small improvements went into this release, as well as a lot of work into features coming in the upcoming release, so stay tuned for 0.55 and beyond!
+
+## Bug Fixes and Misc
+- Added support for array and object values in human readable URL.
+- Cleaned up small nits/issues in new project status page. 
+- Fixed bug in Visual Metrics Editor preventing the UI from updating certain changes. 
+- Fixed bug in DuckDB settings being permanently set
+- Fixed bug in Distributed ClickHouse table resulting in error: table not found. 
+- Fixed bug in dashboard filter, selecting out would apply a 0 filter.
+- Fixed bug where old table remained in cloud storage during rename.
+- Fixed bug where certain error pages in Rill Cloud would be too generic.
\ No newline at end of file

From bc1f8f8b256053cc96674703a6da352c0f5ee521 Mon Sep 17 00:00:00 2001
From: Anshul Khandelwal <12948312+k-anshul@users.noreply.github.com>
Date: Thu, 30 Jan 2025 15:42:45 +0100
Subject: [PATCH 22/48] fix : do not delete projects if github app is suspended
 (#6535)

* do not project deletes when github installation is suspended

* do not project deletes when github installation is suspended
---
 admin/github.go | 36 ++++--------------------------------
 1 file changed, 4 insertions(+), 32 deletions(-)

diff --git a/admin/github.go b/admin/github.go
index 96da0c5f57a..8eb5450bfd9 100644
--- a/admin/github.go
+++ b/admin/github.go
@@ -14,7 +14,6 @@ import (
 	"github.com/rilldata/rill/admin/database"
 	"github.com/rilldata/rill/admin/pkg/gitutil"
 	"github.com/rilldata/rill/runtime/pkg/observability"
-	"go.uber.org/multierr"
 	"go.uber.org/zap"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -234,23 +233,14 @@ func (s *Service) processGithubPush(ctx context.Context, event *github.PushEvent
 	return nil
 }
 
-func (s *Service) processGithubInstallationEvent(ctx context.Context, event *github.InstallationEvent) error {
+func (s *Service) processGithubInstallationEvent(_ context.Context, event *github.InstallationEvent) error {
 	switch event.GetAction() {
 	case "created", "unsuspend", "new_permissions_accepted":
 		// TODO: Should we do anything for unsuspend?
 	case "suspend", "deleted":
-		// the github installation ID will change if user re-installs the app deleting the project for now
-		installation := event.GetInstallation()
-		if installation == nil {
-			return fmt.Errorf("nil installation")
-		}
-
-		s.Logger.Info("github webhook: started processing", zap.String("action", event.GetAction()), zap.Int64("installation_id", installation.GetID()), observability.ZapCtx(ctx))
-		if err := s.deleteProjectsForInstallation(ctx, installation.GetID()); err != nil {
-			s.Logger.Error("github webhook: failed to delete project for installation", zap.Int64("installation_id", installation.GetID()), zap.Error(err), observability.ZapCtx(ctx))
-			return err
-		}
-		s.Logger.Info("github webhook: processed successfully", zap.String("action", event.GetAction()), zap.Int64("installation_id", installation.GetID()), observability.ZapCtx(ctx))
+		// no handling as of now
+		// previously we were deleting the projects
+		// but that means if there is an accidental suspend we delete all projects
 	}
 	return nil
 }
@@ -267,21 +257,3 @@ func (s *Service) processGithubInstallationRepositoriesEvent(_ context.Context,
 	}
 	return nil
 }
-
-func (s *Service) deleteProjectsForInstallation(ctx context.Context, id int64) error {
-	// Find Rill project for installationID
-	projects, err := s.DB.FindProjectsByGithubInstallationID(ctx, id)
-	if err != nil {
-		return err
-	}
-
-	var multiErr error
-	for _, p := range projects {
-		err := s.TeardownProject(ctx, p)
-		if err != nil {
-			multiErr = multierr.Combine(multiErr, fmt.Errorf("unable to delete project %q: %w", p.ID, err))
-			continue
-		}
-	}
-	return multiErr
-}

From 81dbf947b6e0b011516f25a1a9f843e2c08d8f0d Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Thu, 30 Jan 2025 10:00:24 -0500
Subject: [PATCH 23/48] fix (Breadcrumbs): Missing label for projects outside
 the first page (#6533)

---
 .../features/navigation/TopNavigationBar.svelte    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/web-admin/src/features/navigation/TopNavigationBar.svelte b/web-admin/src/features/navigation/TopNavigationBar.svelte
index e1b4cdcf646..d8ed160b2f1 100644
--- a/web-admin/src/features/navigation/TopNavigationBar.svelte
+++ b/web-admin/src/features/navigation/TopNavigationBar.svelte
@@ -74,11 +74,17 @@
     },
   );
 
-  $: projectsQuery = listProjects(organization, undefined, {
-    query: {
-      enabled: !!organization,
+  $: projectsQuery = listProjects(
+    organization,
+    {
+      pageSize: 100,
     },
-  });
+    {
+      query: {
+        enabled: !!organization,
+      },
+    },
+  );
 
   $: visualizationsQuery = useDashboardsV2(instanceId);
 

From 0b87431cf3cc019a572ae176c68aff970998e77e Mon Sep 17 00:00:00 2001
From: Aditya Hegde <adityahegderocks@gmail.com>
Date: Thu, 30 Jan 2025 20:34:27 +0530
Subject: [PATCH 24/48] fix: public urls with computed measures and dependant
 measures are hidden (#6520)

* Add requiredMeasures to explore fields

* Do not send referenced measures for non-window measures

* Fix windowed measures

* Fix lint+tests

* Refactor filter method

* Change function name
---
 .../dimension-table/DimensionDisplay.svelte   |   3 -
 .../dashboards/leaderboard/Leaderboard.svelte |   8 +-
 .../leaderboard/LeaderboardDisplay.svelte     |   3 -
 .../selectors/dashboard-queries.ts            |   5 +-
 .../state-managers/selectors/measures.spec.ts |  82 +++++++------
 .../state-managers/selectors/measures.ts      | 113 +++++-------------
 .../time-series/timeseries-data-store.ts      |  46 ++++---
 .../dashboards/workspace/Dashboard.svelte     |   4 -
 8 files changed, 96 insertions(+), 168 deletions(-)

diff --git a/web-common/src/features/dashboards/dimension-table/DimensionDisplay.svelte b/web-common/src/features/dashboards/dimension-table/DimensionDisplay.svelte
index b34fca09ec0..5846d37645e 100644
--- a/web-common/src/features/dashboards/dimension-table/DimensionDisplay.svelte
+++ b/web-common/src/features/dashboards/dimension-table/DimensionDisplay.svelte
@@ -12,7 +12,6 @@
     type MetricsViewSpecDimensionV2,
     type V1Expression,
     type V1MetricsViewAggregationMeasure,
-    type V1MetricsViewSpec,
     type V1TimeRange,
   } from "@rilldata/web-common/runtime-client";
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
@@ -36,7 +35,6 @@
   export let whereFilter: V1Expression;
   export let metricsViewName: string;
   export let dimensionThresholdFilters: DimensionThresholdFilter[];
-  export let metricsView: V1MetricsViewSpec;
   export let visibleMeasureNames: string[];
   export let timeControlsReady: boolean;
   export let dimension: MetricsViewSpecDimensionV2;
@@ -102,7 +100,6 @@
   $: measures = getMeasuresForDimensionTable(
     activeMeasureName,
     dimensionThresholdFilters,
-    metricsView,
     visibleMeasureNames,
   )
     .map(
diff --git a/web-common/src/features/dashboards/leaderboard/Leaderboard.svelte b/web-common/src/features/dashboards/leaderboard/Leaderboard.svelte
index 889d9ff7afe..d4910785f2d 100644
--- a/web-common/src/features/dashboards/leaderboard/Leaderboard.svelte
+++ b/web-common/src/features/dashboards/leaderboard/Leaderboard.svelte
@@ -6,7 +6,6 @@
     MetricsViewSpecDimensionV2,
     V1Expression,
     V1MetricsViewAggregationMeasure,
-    V1MetricsViewSpec,
     V1TimeRange,
   } from "@rilldata/web-common/runtime-client";
   import {
@@ -24,7 +23,6 @@
     additionalMeasures,
     getFiltersForOtherDimensions,
   } from "../selectors";
-  import { getIndependentMeasures } from "../state-managers/selectors/measures";
   import {
     createAndExpression,
     createOrExpression,
@@ -60,7 +58,6 @@
   export let dimensionThresholdFilters: DimensionThresholdFilter[];
   export let activeMeasureName: string;
   export let metricsViewName: string;
-  export let metricsView: V1MetricsViewSpec;
   export let sortType: SortType;
   export let tableWidth: number;
   export let sortedAscending: boolean;
@@ -125,10 +122,7 @@
         undefined,
       );
 
-  $: measures = getIndependentMeasures(
-    metricsView,
-    additionalMeasures(activeMeasureName, dimensionThresholdFilters),
-  )
+  $: measures = additionalMeasures(activeMeasureName, dimensionThresholdFilters)
     .map(
       (n) =>
         ({
diff --git a/web-common/src/features/dashboards/leaderboard/LeaderboardDisplay.svelte b/web-common/src/features/dashboards/leaderboard/LeaderboardDisplay.svelte
index 366f3770391..b25f8665499 100644
--- a/web-common/src/features/dashboards/leaderboard/LeaderboardDisplay.svelte
+++ b/web-common/src/features/dashboards/leaderboard/LeaderboardDisplay.svelte
@@ -2,7 +2,6 @@
   import { getStateManagers } from "@rilldata/web-common/features/dashboards/state-managers/state-managers";
   import type {
     V1Expression,
-    V1MetricsViewSpec,
     V1TimeRange,
   } from "@rilldata/web-common/runtime-client";
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
@@ -22,7 +21,6 @@
   export let comparisonTimeRange: V1TimeRange | undefined;
   export let timeControlsReady: boolean;
   export let activeMeasureName: string;
-  export let metricsView: V1MetricsViewSpec;
 
   const StateManagers = getStateManagers();
   const {
@@ -108,7 +106,6 @@
               isSummableMeasure={$isSummableMeasure}
               {parentElement}
               {suppressTooltip}
-              {metricsView}
               {timeControlsReady}
               selectedValues={$selectedDimensionValues(dimension.name)}
               isBeingCompared={$isBeingComparedReadable(dimension.name)}
diff --git a/web-common/src/features/dashboards/state-managers/selectors/dashboard-queries.ts b/web-common/src/features/dashboards/state-managers/selectors/dashboard-queries.ts
index c683ac1cf0f..9a830715d75 100644
--- a/web-common/src/features/dashboards/state-managers/selectors/dashboard-queries.ts
+++ b/web-common/src/features/dashboards/state-managers/selectors/dashboard-queries.ts
@@ -1,17 +1,14 @@
-import { getIndependentMeasures } from "@rilldata/web-common/features/dashboards/state-managers/selectors/measures";
-import type { V1MetricsViewSpec } from "@rilldata/web-common/runtime-client";
 import { additionalMeasures } from "../../selectors";
 import type { DimensionThresholdFilter } from "../../stores/metrics-explorer-entity";
 
 export function getMeasuresForDimensionTable(
   activeMeasureName: string,
   dimensionThresholdFilters: DimensionThresholdFilter[],
-  metricsView: V1MetricsViewSpec | undefined,
   visibleMeasureNames: string[],
 ) {
   const allMeasures = new Set([
     ...visibleMeasureNames,
     ...additionalMeasures(activeMeasureName, dimensionThresholdFilters),
   ]);
-  return getIndependentMeasures(metricsView ?? {}, [...allMeasures]);
+  return [...allMeasures];
 }
diff --git a/web-common/src/features/dashboards/state-managers/selectors/measures.spec.ts b/web-common/src/features/dashboards/state-managers/selectors/measures.spec.ts
index 320c64afde0..5a6756a5413 100644
--- a/web-common/src/features/dashboards/state-managers/selectors/measures.spec.ts
+++ b/web-common/src/features/dashboards/state-managers/selectors/measures.spec.ts
@@ -1,4 +1,4 @@
-import { getFilteredMeasuresAndDimensions } from "@rilldata/web-common/features/dashboards/state-managers/selectors/measures";
+import { removeSomeAdvancedMeasures } from "@rilldata/web-common/features/dashboards/state-managers/selectors/measures";
 import type { MetricsExplorerEntity } from "@rilldata/web-common/features/dashboards/stores/metrics-explorer-entity";
 import {
   type V1MetricsViewSpec,
@@ -13,15 +13,7 @@ describe("measures selectors", () => {
         title: "with unspecified grains, selected DAY",
         measures: ["mes", "mes_time_no_grain"],
         timeGrain: V1TimeGrain.TIME_GRAIN_DAY,
-        expected: {
-          measures: ["mes", "mes_time_no_grain"],
-          dimensions: [
-            {
-              name: "time",
-              timeGrain: V1TimeGrain.TIME_GRAIN_UNSPECIFIED,
-            },
-          ],
-        },
+        expectedMeasures: ["mes", "mes_time_no_grain"],
       },
       {
         title: "with unspecified and specified grains, selected DAY",
@@ -32,15 +24,7 @@ describe("measures selectors", () => {
           "mes_time_week_grain",
         ],
         timeGrain: V1TimeGrain.TIME_GRAIN_DAY,
-        expected: {
-          measures: ["mes", "mes_time_no_grain", "mes_time_day_grain"],
-          dimensions: [
-            {
-              name: "time",
-              timeGrain: V1TimeGrain.TIME_GRAIN_DAY,
-            },
-          ],
-        },
+        expectedMeasures: ["mes", "mes_time_no_grain", "mes_time_day_grain"],
       },
       {
         title: "with unspecified and specified grains, selected WEEK",
@@ -51,15 +35,7 @@ describe("measures selectors", () => {
           "mes_time_week_grain",
         ],
         timeGrain: V1TimeGrain.TIME_GRAIN_WEEK,
-        expected: {
-          measures: ["mes", "mes_time_no_grain", "mes_time_week_grain"],
-          dimensions: [
-            {
-              name: "time",
-              timeGrain: V1TimeGrain.TIME_GRAIN_WEEK,
-            },
-          ],
-        },
+        expectedMeasures: ["mes", "mes_time_no_grain", "mes_time_week_grain"],
       },
       {
         title: "with unspecified and specified grains, selected MONTH",
@@ -70,15 +46,13 @@ describe("measures selectors", () => {
           "mes_time_week_grain",
         ],
         timeGrain: V1TimeGrain.TIME_GRAIN_MONTH,
-        expected: {
-          measures: ["mes", "mes_time_no_grain"],
-          dimensions: [
-            {
-              name: "time",
-              timeGrain: V1TimeGrain.TIME_GRAIN_UNSPECIFIED,
-            },
-          ],
-        },
+        expectedMeasures: ["mes", "mes_time_no_grain"],
+      },
+      {
+        title: "with window measure and select it",
+        measures: ["mes", "window_mes"],
+        timeGrain: V1TimeGrain.TIME_GRAIN_MONTH,
+        expectedMeasures: ["mes", "window_mes"],
       },
     ];
     const MetricsView: V1MetricsViewSpec = {
@@ -114,20 +88,44 @@ describe("measures selectors", () => {
             },
           ],
         },
+        {
+          name: "window_mes",
+          window: {
+            partition: true,
+          },
+        },
       ],
     };
-    for (const { title, measures, timeGrain, expected } of TestCases) {
+    for (const { title, measures, timeGrain, expectedMeasures } of TestCases) {
       it(title, () => {
         expect(
-          getFilteredMeasuresAndDimensions({
-            dashboard: {
+          removeSomeAdvancedMeasures(
+            {
               selectedTimeRange: {
                 interval: timeGrain,
               },
             } as MetricsExplorerEntity,
-          })(MetricsView, measures),
-        ).toEqual(expected);
+            MetricsView,
+            measures,
+            true,
+          ),
+        ).toEqual(expectedMeasures);
       });
     }
+
+    it("with window measure and do not select it", () => {
+      expect(
+        removeSomeAdvancedMeasures(
+          {
+            selectedTimeRange: {
+              interval: V1TimeGrain.TIME_GRAIN_UNSPECIFIED,
+            },
+          } as MetricsExplorerEntity,
+          MetricsView,
+          ["mes", "window_mes"],
+          false,
+        ),
+      ).toEqual(["mes"]);
+    });
   });
 });
diff --git a/web-common/src/features/dashboards/state-managers/selectors/measures.ts b/web-common/src/features/dashboards/state-managers/selectors/measures.ts
index bb7c94c1f77..e59427b41f9 100644
--- a/web-common/src/features/dashboards/state-managers/selectors/measures.ts
+++ b/web-common/src/features/dashboards/state-managers/selectors/measures.ts
@@ -1,5 +1,5 @@
+import type { MetricsExplorerEntity } from "@rilldata/web-common/features/dashboards/stores/metrics-explorer-entity";
 import {
-  type MetricsViewSpecDimensionSelector,
   MetricsViewSpecMeasureType,
   type MetricsViewSpecMeasureV2,
   type V1MetricsViewSpec,
@@ -82,95 +82,49 @@ export const filteredSimpleMeasures = ({
 };
 
 /**
- * Selects measure valid for current dashboard selections.
- * Also includes additional dimensions needed for any advanced measures.
+ * Selects measure valid for current dashboard selections. We filter out advanced measures that are,
+ * 1. Of type MEASURE_TYPE_TIME_COMPARISON.
+ * 2. Dependent on a time dimension with a defined grain and not equal to the current selected grain.
+ * 3. Window measures if includeWindowMeasures=false. Right now totals query does not support these.
  */
-export const getFilteredMeasuresAndDimensions = ({
-  dashboard,
-}: Pick<DashboardDataSources, "dashboard">) => {
-  return (
-    metricsViewSpec: V1MetricsViewSpec,
-    measureNames: string[],
-  ): {
-    measures: string[];
-    dimensions: MetricsViewSpecDimensionSelector[];
-  } => {
-    const dimensions = new Map<string, V1TimeGrain>();
-    const measures = new Set<string>();
-    measureNames.forEach((measureName) => {
-      const measure = metricsViewSpec.measures?.find(
-        (m) => m.name === measureName,
-      );
-      if (
-        !measure ||
-        measure.type === MetricsViewSpecMeasureType.MEASURE_TYPE_TIME_COMPARISON
-        // TODO: we need to send a single query for this support
-        // (measure.type ===
-        //   MetricsViewSpecMeasureType.MEASURE_TYPE_TIME_COMPARISON &&
-        //   (!dashboard.showTimeComparison ||
-        //     !dashboard.selectedComparisonTimeRange))
-      )
-        return;
-
-      let skipMeasure = false;
-      measure.requiredDimensions?.forEach((reqDim) => {
-        if (
-          reqDim.timeGrain !== V1TimeGrain.TIME_GRAIN_UNSPECIFIED &&
-          reqDim.timeGrain !== dashboard.selectedTimeRange?.interval
-        ) {
-          // filter out measures with dependant dimensions not matching the selected grain
-          skipMeasure = true;
-          return;
-        }
-        if (!reqDim.name) return;
-
-        const existingEntry = dimensions.get(reqDim.name);
-        if (existingEntry) {
-          if (existingEntry === V1TimeGrain.TIME_GRAIN_UNSPECIFIED) {
-            dimensions.set(
-              reqDim.name,
-              reqDim.timeGrain ?? V1TimeGrain.TIME_GRAIN_UNSPECIFIED,
-            );
-          } else {
-            // mismatching measures are requested
-            skipMeasure = true;
-          }
-          return;
-        }
-
-        dimensions.set(
-          reqDim.name,
-          reqDim.timeGrain ?? V1TimeGrain.TIME_GRAIN_UNSPECIFIED,
-        );
-      });
-      if (skipMeasure) return;
-      measures.add(measureName);
-      measure.referencedMeasures?.filter((refMes) => measures.add(refMes));
-    });
-    return {
-      measures: [...measures],
-      dimensions: [...dimensions.entries()].map(([name, timeGrain]) => ({
-        name,
-        timeGrain,
-      })),
-    };
-  };
-};
-
-export const getIndependentMeasures = (
+export const removeSomeAdvancedMeasures = (
+  exploreState: MetricsExplorerEntity,
   metricsViewSpec: V1MetricsViewSpec,
   measureNames: string[],
+  includeWindowMeasures: boolean,
 ) => {
   const measures = new Set<string>();
   measureNames.forEach((measureName) => {
     const measure = metricsViewSpec.measures?.find(
       (m) => m.name === measureName,
     );
-    // temporary check for window measures until the PR to move to AggregationApi is merged
-    if (!measure || measure.requiredDimensions?.length || !!measure.window)
+    if (
+      !measure ||
+      measure.type ===
+        MetricsViewSpecMeasureType.MEASURE_TYPE_TIME_COMPARISON ||
+      (!includeWindowMeasures && measure.window)
+      // TODO: we need to send a single query for this support
+      // (measure.type ===
+      //   MetricsViewSpecMeasureType.MEASURE_TYPE_TIME_COMPARISON &&
+      //   (!dashboard.showTimeComparison ||
+      //     !dashboard.selectedComparisonTimeRange))
+    )
       return;
+
+    let skipMeasure = false;
+    measure.requiredDimensions?.forEach((reqDim) => {
+      if (
+        reqDim.timeGrain !== V1TimeGrain.TIME_GRAIN_UNSPECIFIED &&
+        reqDim.timeGrain !== exploreState.selectedTimeRange?.interval
+      ) {
+        // filter out measures with dependant dimensions not matching the selected grain
+        skipMeasure = true;
+        return;
+      }
+    });
+    if (skipMeasure) return;
+
     measures.add(measureName);
-    measure.referencedMeasures?.filter((refMes) => measures.add(refMes));
   });
   return [...measures];
 };
@@ -212,6 +166,5 @@ export const measureSelectors = {
 
   filteredSimpleMeasures,
 
-  getFilteredMeasuresAndDimensions,
   leaderboardMeasureName,
 };
diff --git a/web-common/src/features/dashboards/time-series/timeseries-data-store.ts b/web-common/src/features/dashboards/time-series/timeseries-data-store.ts
index 33fe8381acb..a682112a20b 100644
--- a/web-common/src/features/dashboards/time-series/timeseries-data-store.ts
+++ b/web-common/src/features/dashboards/time-series/timeseries-data-store.ts
@@ -1,8 +1,5 @@
 import { mergeMeasureFilters } from "@rilldata/web-common/features/dashboards/filters/measure-filters/measure-filter-utils";
-import {
-  getFilteredMeasuresAndDimensions,
-  getIndependentMeasures,
-} from "@rilldata/web-common/features/dashboards/state-managers/selectors/measures";
+import { removeSomeAdvancedMeasures } from "@rilldata/web-common/features/dashboards/state-managers/selectors/measures";
 import type { StateManagers } from "@rilldata/web-common/features/dashboards/state-managers/state-managers";
 import { sanitiseExpression } from "@rilldata/web-common/features/dashboards/stores/filter-utils";
 import { useTimeControlStore } from "@rilldata/web-common/features/dashboards/time-controls/time-control-store";
@@ -133,17 +130,22 @@ export function createTimeSeriesDataStore(
           : [];
       }
 
-      const { measures: filteredMeasures } = getFilteredMeasuresAndDimensions({
-        dashboard: dashboardStore,
-      })(metricsView ?? {}, measures);
-      const independentMeasures = getIndependentMeasures(
+      const measuresForTimeSeries = removeSomeAdvancedMeasures(
+        dashboardStore,
         metricsView ?? {},
         measures,
+        true,
+      );
+      const measuresForTotals = removeSomeAdvancedMeasures(
+        dashboardStore,
+        metricsView ?? {},
+        measures,
+        false,
       );
 
       const primaryTimeSeries =
-        measures.length > 0
-          ? createMetricsViewTimeSeries(ctx, filteredMeasures, false)
+        measuresForTimeSeries.length > 0
+          ? createMetricsViewTimeSeries(ctx, measuresForTimeSeries, false)
           : writable({
               isFetching: false,
               isError: false,
@@ -152,13 +154,13 @@ export function createTimeSeriesDataStore(
             });
 
       const primaryTotals =
-        measures.length > 0
-          ? createTotalsForMeasure(ctx, independentMeasures, false)
+        measuresForTotals.length > 0
+          ? createTotalsForMeasure(ctx, measuresForTotals, false)
           : writable({
               isFetching: false,
               isError: false,
-              data: null,
-              error: {},
+              data: { data: [] },
+              error: undefined,
             });
 
       let unfilteredTotals:
@@ -168,7 +170,7 @@ export function createTimeSeriesDataStore(
       if (dashboardStore?.selectedComparisonDimension) {
         unfilteredTotals = createUnfilteredTotalsForMeasure(
           ctx,
-          independentMeasures,
+          measures,
           dashboardStore?.selectedComparisonDimension,
         );
       }
@@ -181,14 +183,10 @@ export function createTimeSeriesDataStore(
       if (showComparison) {
         comparisonTimeSeries = createMetricsViewTimeSeries(
           ctx,
-          filteredMeasures,
-          true,
-        );
-        comparisonTotals = createTotalsForMeasure(
-          ctx,
-          independentMeasures,
+          measuresForTimeSeries,
           true,
         );
+        comparisonTotals = createTotalsForMeasure(ctx, measures, true);
       }
 
       let dimensionTimeSeriesCharts:
@@ -197,7 +195,7 @@ export function createTimeSeriesDataStore(
       if (dashboardStore?.selectedComparisonDimension) {
         dimensionTimeSeriesCharts = getDimensionValueTimeSeries(
           ctx,
-          filteredMeasures,
+          measuresForTimeSeries,
           "chart",
         );
       }
@@ -242,9 +240,7 @@ export function createTimeSeriesDataStore(
           }
           if (primaryTotal.error) {
             isError = true;
-            error["totals"] = (
-              primaryTotal.error as HTTPError
-            ).response?.data?.message;
+            error["totals"] = primaryTotal.error.response?.data?.message;
           }
 
           return {
diff --git a/web-common/src/features/dashboards/workspace/Dashboard.svelte b/web-common/src/features/dashboards/workspace/Dashboard.svelte
index f03dde5122e..d5111b26691 100644
--- a/web-common/src/features/dashboards/workspace/Dashboard.svelte
+++ b/web-common/src/features/dashboards/workspace/Dashboard.svelte
@@ -90,8 +90,6 @@
       }
     : undefined;
 
-  $: metricsView = $explore.data?.metricsView ?? {};
-
   let metricsWidth = DEFAULT_TIMESERIES_WIDTH;
   let resizing = false;
 </script>
@@ -187,7 +185,6 @@
               {comparisonTimeRange}
               activeMeasureName={$activeMeasureName}
               {timeControlsReady}
-              {metricsView}
               visibleMeasureNames={$visibleMeasures.map(
                 ({ name }) => name ?? "",
               )}
@@ -201,7 +198,6 @@
               {dimensionThresholdFilters}
               {timeRange}
               {comparisonTimeRange}
-              {metricsView}
               {timeControlsReady}
             />
           {/if}

From 66b2c5c4c5836ecf01d4a1c9d29cf7372f8ce50e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Egelund-M=C3=BCller?= <b@egelund-muller.com>
Date: Thu, 30 Jan 2025 16:14:03 +0100
Subject: [PATCH 25/48] Remove circular dependency on the metrics project
 (#6536)

---
 admin/admin.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/admin/admin.go b/admin/admin.go
index f85e25122ef..028bdd09a8d 100644
--- a/admin/admin.go
+++ b/admin/admin.go
@@ -104,9 +104,11 @@ func New(ctx context.Context, opts *Options, logger *zap.Logger, issuer *auth.Is
 	if opts.MetricsProjectOrg != "" && opts.MetricsProjectName != "" {
 		proj, err := db.FindProjectByName(ctx, opts.MetricsProjectOrg, opts.MetricsProjectName)
 		if err != nil {
-			return nil, fmt.Errorf("error looking up metrics project: %w", err)
+			logger.Error("error looking up metrics project", zap.Error(err))
+			// Not returning the error since that causes a circular dependency. Remember that evening in Amsterdam?
+		} else {
+			metricsProjectID = proj.ID
 		}
-		metricsProjectID = proj.ID
 	}
 
 	return &Service{

From 52b4b10d21ca95c5faeb72b75d97557dcfae1a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Egelund-M=C3=BCller?= <b@egelund-muller.com>
Date: Thu, 30 Jan 2025 17:00:05 +0100
Subject: [PATCH 26/48] Add API resolver properties back (#6537)

---
 runtime/server/api.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/runtime/server/api.go b/runtime/server/api.go
index a25e2e6bff5..cbf8ee57ff0 100644
--- a/runtime/server/api.go
+++ b/runtime/server/api.go
@@ -72,10 +72,11 @@ func (s *Server) apiHandler(w http.ResponseWriter, req *http.Request) error {
 
 	// Resolve the API to JSON data
 	res, err := s.runtime.Resolve(ctx, &runtime.ResolveOptions{
-		InstanceID: instanceID,
-		Resolver:   api.Spec.Resolver,
-		Args:       args,
-		Claims:     claims,
+		InstanceID:         instanceID,
+		Resolver:           api.Spec.Resolver,
+		ResolverProperties: api.Spec.ResolverProperties.AsMap(),
+		Args:               args,
+		Claims:             claims,
 	})
 	if err != nil {
 		return httputil.Error(http.StatusBadRequest, err)

From 918ea25ebef5e99af8cc6ef1e11a5602ebf821de Mon Sep 17 00:00:00 2001
From: Anshul Khandelwal <12948312+k-anshul@users.noreply.github.com>
Date: Thu, 30 Jan 2025 17:13:35 +0100
Subject: [PATCH 27/48] set ctx on batches so they respond to cancellation
 (#6538)

---
 runtime/drivers/snowflake/warehouse.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/runtime/drivers/snowflake/warehouse.go b/runtime/drivers/snowflake/warehouse.go
index 23880d58326..5c891c64517 100644
--- a/runtime/drivers/snowflake/warehouse.go
+++ b/runtime/drivers/snowflake/warehouse.go
@@ -97,6 +97,10 @@ func (c *connection) QueryAsFiles(ctx context.Context, props map[string]any) (it
 		return nil, drivers.ErrNoRows
 	}
 
+	for i := range batches {
+		batches[i] = batches[i].WithContext(ctx)
+	}
+
 	tempDir, err := c.storage.RandomTempDir("snowflake")
 	if err != nil {
 		return nil, err

From 22cfb690e052783720d5cc069faccc1ae495d658 Mon Sep 17 00:00:00 2001
From: Roy Endo <67675319+royendo@users.noreply.github.com>
Date: Thu, 30 Jan 2025 09:24:13 -0700
Subject: [PATCH 28/48] .env auto deploy docs (#6479)

---
 .../docs/build/connect/multiple-connectors.md |  4 +-
 docs/docs/build/credentials/credentials.md    | 54 ++++++++++++++++---
 docs/docs/deploy/deploy-credentials.md        | 19 +++++--
 .../deploy/deploy-dashboard/_category_.yml    |  2 +-
 .../deploy-dashboard/deploy-dashboard.md      |  6 +--
 docs/docs/explore/alerts/slack.md             |  2 +-
 docs/docs/home/FAQ.md                         |  2 +-
 .../variables-and-credentials.md              | 12 +++--
 docs/docs/reference/project-files/sources.md  |  4 +-
 9 files changed, 78 insertions(+), 27 deletions(-)

diff --git a/docs/docs/build/connect/multiple-connectors.md b/docs/docs/build/connect/multiple-connectors.md
index 9a624c47abb..a83e6997305 100644
--- a/docs/docs/build/connect/multiple-connectors.md
+++ b/docs/docs/build/connect/multiple-connectors.md
@@ -5,7 +5,7 @@ sidebar_label: Multiple Connectors
 sidebar_position: 20
 ---
 
-Sometimes, you will need to set up multiple connectors of the same type in one project with different connection strings (DSN) or configurations for sources. A common example would be that you have a need for multiple [Snowflake](/reference/connectors/snowflake.md) sources that point to different databases and schemas. Therefore, when [deploying your project to Rill Cloud](/deploy/deploy-dashboard/#deploying-a-project-via-the-ui), you will want to specify multiple `snowflake.connector.dsn` connection strings, one corresponding to each unique "connection" you desire (with different connection parameters).
+Sometimes, you will need to set up multiple connectors of the same type in one project with different connection strings (DSN) or configurations for sources. A common example would be that you have a need for multiple [Snowflake](/reference/connectors/snowflake.md) sources that point to different databases and schemas. Therefore, when [deploying your project to Rill Cloud](/deploy/deploy-dashboard/#deploying-a-project-from-rill-developer), you will want to specify multiple `snowflake.connector.dsn` connection strings, one corresponding to each unique "connection" you desire (with different connection parameters).
 
 ## Defining multiple connectors in `rill.yaml`
 
@@ -51,7 +51,7 @@ sql: "select * from table_B"
 
 ## Setting credentials for each connector when deploying to Rill Cloud
 
-Finally, when deploying the project to Rill Cloud, you will want to follow the same steps to [set the credentials](/deploy/deploy-credentials#configure-environmental-variables-and-credentials-on-rill-cloud) for each connector.
+Finally, when deploying the project to Rill Cloud, you will want to follow the same steps to [set the credentials](/deploy/deploy-credentials#configure-environmental-variables-and-credentials-for-rill-cloud) for each connector.
 
 If using `rill env configure`, you should be prompted to input the correct `connector.<connector_name>.dsn` connection strings.
 
diff --git a/docs/docs/build/credentials/credentials.md b/docs/docs/build/credentials/credentials.md
index dbf54f1a655..4725fef2402 100644
--- a/docs/docs/build/credentials/credentials.md
+++ b/docs/docs/build/credentials/credentials.md
@@ -1,6 +1,6 @@
 ---
 title: Configure connector credentials
-sidebar_label: Configure Credentials
+sidebar_label: Configure Local Credentials
 sidebar_position: 00
 ---
 
@@ -8,8 +8,8 @@ Rill requires credentials to connect to remote data sources such as private buck
 
 At a high level, configuring credentials and credentials management in Rill can be broken down into three categories:
 - Setting credentials for Rill Developer
-- [Setting credentials for a Rill Cloud project](/manage/project-management/variables-and-credentials)
-- Pushing and pulling credentials to / from Rill Cloud
+- [Setting credentials for a Rill Cloud project](/deploy/deploy-credentials)
+- [Pushing and pulling credentials to / from Rill Cloud](/manage/project-management/variables-and-credentials)
 
 ## Setting credentials for Rill Developer
 
@@ -17,7 +17,7 @@ When reading from a source (or using a different OLAP engine), Rill will attempt
 1. Credentials that have been configured in your local environment via the CLI (for [AWS](../../reference/connectors/s3.md#local-credentials) / [Azure](../../reference/connectors/azure.md#local-credentials) / [Google Cloud](../../reference/connectors/gcs#rill-developer-local-credentials))
 2. Credentials that have been passed in directly through the connection string or DSN (typically for databases - see [Source YAML](../../reference/project-files/sources.md) and [Connector YAML](../../reference/project-files/connectors.md) for more details)
 3. Credentials that have been passed in as a [variable](../../deploy/templating.md) when starting Rill Developer via `rill start --env key=value`
-4. Credentials that have been specified in your *`<RILL_PROJECT_HOME>/.env`* file
+4. Credentials that have been specified in your *`<RILL_PROJECT_HOME>/.env`* file, see  [credential naming schema](#credentials-naming-schema) for more information.
 
 For more details, please refer to the corresponding [connector](../../reference/connectors/connectors.md) or [OLAP engine](../../reference/olap-engines/olap-engines.md) page.
 
@@ -52,14 +52,13 @@ It's never a good idea to commit sensitive information to Git and goes against s
 
 ## Deploying to Rill Cloud 
 
-:::tip Ready to Deploy?
-Please see our [deploy credentials page](/deploy/deploy-credentials#configure-environmental-variables-and-credentials-on-rill-cloud) to configure your credentials on Rill Cloud.
-:::
+Please see our [deploy credentials page](/deploy/deploy-credentials#configure-environmental-variables-and-credentials-for-rill-cloud) to configure your credentials on Rill Cloud. If you have configured your credentials via the `.env` file this will be deployed with your project. If not, follow the steps to deploy then configure your credentials via the CLI running `rill env configure`.
+
 
 
 ## Pulling Credentials and Variables from a Deployed Project on Rill Cloud
 
-If you are making changes to an already deployed instance from Rill Cloud, it is possible to **sync** the credentials and variables from the Rill Cloud to your local instance of Rill Developer. 
+If you are making changes to an already deployed instance from Rill Cloud, it is possible to **pull** the credentials and variables from the Rill Cloud to your local instance of Rill Developer. If you've made any changes to the credentials, don't forget to run `rill env push` to push the variable changes to the project, or manually change these in the project's setting page.
 
 ### rill env pull
 
@@ -87,3 +86,42 @@ If a credential and/or variable has already been configured in Rill Cloud, Rill
 
 :::
 
+
+### Credentials Naming Schema 
+
+Connector credentials are essentially a form of project variable, prefixed using the `connector.<connector_name>.<property>` syntax. For example, `connector.druid.dsn` and `connector.clickhouse.dsn` are both hardcoded project variables (that happen to correspond to the [Druid](/reference/olap-engines/druid.md) and [ClickHouse](/reference/olap-engines/clickhouse.md) OLAP engines respectively). Please see below for each source and its required properties. If you have any questions or need specifics, [contact us](../../contact)! 
+
+
+<div
+    style={{
+    width: '100%',
+    margin: 'auto',
+    padding: '20px',
+    textAlign: 'center', 
+    display: 'flex', 
+    justifyContent: 'center',
+    alignItems: 'center'
+    }}
+>
+|           **Source Name**   |        Property             |      Example         |
+| :-----------------------: | :-------------------------:  | :------------------- |
+|       **GCS**                |`GOOGLE_APPLICATION_CREDENTIALS`| `connector.gcs.google_application_credentials` |
+|                          |`GCS_BUCKET_NAME`| `connector.gcs.gcs_bucket_name` |
+| **AWS S3**                  | `AWS_ACCESS_KEY_ID`         | `connector.s3.aws_access_key_id` |
+|                          | `AWS_SECRET_ACCESS_KEY`     |`connector.s3.aws_secret_access_key` |
+|       **Azure**              |`AZURE_STORAGE_ACCOUNT`|`connector.azure.azure_storage_account`|
+|                          |`AZURE_STORAGE_KEY`|`connector.azure.azure_storage_key`|
+|                          |`AZURE_CLIENT_ID`|`connector.azure.azure_client_id`|
+|                          |`AZURE_CLIENT_SECRET`|`connector.azure.azure_client_secret`|
+|                          |`AZURE_TENANT_ID`|`connector.azure.azure_tenant_id`|
+| **Big Query**               | `GOOGLE_APPLICATION_CREDENTIALS` |`connector.bigquery.google_application_credentials` |
+|     **Snowflake**            |`DSN`|`connector.snowflake.dsn`|
+|     **ClickHouse**           |`HOST`|`connector.clickhouse.host `|
+|                          |`PORT`|`connector.clickhouse.port `|
+|                          |`USERNAME`|`connector.clickhouse.username `|
+|                          |`PASSWORD`|`connector.clickhouse.password `|
+|                          |`SSL`|`connector.clickhouse.ssl `|
+|                          |`DATABASE`|`connector.clickhouse.database `|
+...
+
+</div>
\ No newline at end of file
diff --git a/docs/docs/deploy/deploy-credentials.md b/docs/docs/deploy/deploy-credentials.md
index 1477882d38e..c884dcbfb29 100644
--- a/docs/docs/deploy/deploy-credentials.md
+++ b/docs/docs/deploy/deploy-credentials.md
@@ -1,12 +1,16 @@
 ---
 title: Deployment Credentials
 description: Configuring credentials for your deployed project on Rill Cloud
-sidebar_label: Deployment Credentials
-sidebar_position: 11
+sidebar_label: Configure Deployment Credentials
+sidebar_position: 10
 ---
 ## Overview
 
-When deploying a project to Rill Cloud, credentials will need to be **separately** specified and passed in for Rill Cloud to connect to and ingest data from [remote sources](/reference/connectors/connectors.md). [Local credentials](/build/credentials/#setting-credentials-for-rill-developer) will be used by Rill Developer to connect to sources from your local machine, typically for local devlopment and modeling, while [deployment credentials](/deploy/deploy-credentials#configure-environmental-variables-and-credentials-on-rill-cloud) are what is used by Rill Cloud for production workloads. For more details about using and setting deployment credentials, please see our [configuring credentials](../build/credentials/credentials.md) page and the respective [connectors](/reference/connectors/connectors.md) or [OLAP engine](/reference/olap-engines/olap-engines.md) page.
+
+When deploying a project, credentials that have been defined in your `.env` file will but automatically passed into your Rill Cloud project. However, for [remote sources](/reference/connectors/connectors.md) that are dynamically retrieving your credentials via the CLI, such as S3 and GCS, you will need to ensure that these are [defined in the .env file](/manage/project-management/variables-and-credentials#credentials-naming-schema). 
+
+
+[Local credentials](/build/credentials/#setting-credentials-for-rill-developer) are used by Rill Developer to connect to sources from your local machine, while [deployment credentials](/deploy/deploy-credentials#configure-environmental-variables-and-credentials-for-rill-cloud) are what is used by Rill Cloud for production workloads. There are a [few ways to setup credentials in Rill Developer](../build/credentials/#setting-credentials-for-rill-developer), however you will need to ensure that they are set up in your `.env` file for a seemless experience.
 
 :::info Separating development and production credentials
 
@@ -14,9 +18,14 @@ As a general best practice, it is strongly recommended to use service accounts a
 
 :::
 
-## Configure Environmental Variables and Credentials on Rill Cloud 
 
-Once you are ready to deploy or have already deployed and are experiencing issues connecting to your source, you will need to run the following command, `rill env configure`. When running this command, Rill will detect any connectors that are being used by the project and prompt you to fill in the required fields. When completed, this will be pushed to your Rill Cloud Deployment and automatically refresh the required objects. 
+## Configure Environmental Variables and Credentials for Rill Cloud 
+
+If you have defined your connector's credentials in your `.env` file, these will be deployed along with your project. You should see the credentials in [your project's settings page.](/manage/project-management/variables-and-credentials#modifying-variables-and-credentials-via-the-settings-page)
+
+![img](/img/tutorials/admin/env-var-ui.png)
+
+If not, after deploying to Rill Cloud, you can run the following in the CLI to configure all of your required credentials: `rill env configure`. When running this command, Rill will detect any connectors that are being used by the project and prompt you to fill in the required fields. When completed, this will be pushed to your Rill Cloud Deployment and automatically refresh the required objects. Once completed, you will see these in your project's environmental variables settings page. 
 
 
 ```bash
diff --git a/docs/docs/deploy/deploy-dashboard/_category_.yml b/docs/docs/deploy/deploy-dashboard/_category_.yml
index 570d6132eb3..5f282d8c6b8 100644
--- a/docs/docs/deploy/deploy-dashboard/_category_.yml
+++ b/docs/docs/deploy/deploy-dashboard/_category_.yml
@@ -1,4 +1,4 @@
-position: 00
+position: 11
 label: Deploy Dashboards
 collapsible: true
 collapsed: true
diff --git a/docs/docs/deploy/deploy-dashboard/deploy-dashboard.md b/docs/docs/deploy/deploy-dashboard/deploy-dashboard.md
index f8a98192a01..7a292fd91e2 100644
--- a/docs/docs/deploy/deploy-dashboard/deploy-dashboard.md
+++ b/docs/docs/deploy/deploy-dashboard/deploy-dashboard.md
@@ -12,7 +12,7 @@ sidebar_position: 00
 Deploying dashboards from Rill Developer allows you to share dashboards with other users, leverage [Rill Cloud capabilities](../../explore/dashboard-101), [embed Rill](/integrate/embedding.md) into other applications, and more!
 
 :::tip Configure credentials
-Cloud datastores will typically require service keys to access data. Make sure to create the necessary key for your service account and then run ```rill env configure``` with the correct credentials. For more details, please refer to our [connector documentation](/build/credentials/credentials.md).
+Cloud datastores will typically require service keys to access data. Make sure to you create the necessary key for your service account and either add these credetials to your `.env` file directly or deploy your project and then run ```rill env configure``` with the correct credentials. For more details, please refer to our [connector documentation](/build/credentials/credentials.md).
 :::
 
 The flow diagram below shows two options for deploying an existing project. 
@@ -39,8 +39,8 @@ graph LR;
     A--2. Push changes to GitHub-->C;
 ```
     
-## Deploying a project via the UI
-Starting from **v0.48**, we have introduced the possibility to push dashboards _directly from Rill Developer's UI to Rill Cloud_. On the dashboard page, you can select the `Deploy` button and follow the steps to deploy to Rill Cloud.
+## Deploying a project from Rill Developer
+Starting from **v0.48**, we have introduced the possibility to push dashboards _directly from Rill Developer to Rill Cloud_. On the dashboard page, you can select the `Deploy` button and follow the steps to deploy to Rill Cloud.
 
 <img src = '/img/deploy/existing-project/deploy-ui.gif' class='rounded-gif' />
 <br />
diff --git a/docs/docs/explore/alerts/slack.md b/docs/docs/explore/alerts/slack.md
index 226160ad8a8..df1fef66bf2 100644
--- a/docs/docs/explore/alerts/slack.md
+++ b/docs/docs/explore/alerts/slack.md
@@ -39,7 +39,7 @@ The last two scopes are required to find the user's ID by email.
 
 ## Enabling the Slack integration in your project
 
-Once the Slack integration has been set up, the Slack destination will need to be enabled on a per project basis (note - alerts can only be configured on projects deployed to Rill Cloud). This requires the `connector.slack.bot_token` connector variable to be set, which can be configured in Rill through a fashion very similar to [setting credentials](/deploy/deploy-credentials#configure-environmental-variables-and-credentials-on-rill-cloud) for other connectors. Please use one of the available options below.
+Once the Slack integration has been set up, the Slack destination will need to be enabled on a per project basis (note - alerts can only be configured on projects deployed to Rill Cloud). This requires the `connector.slack.bot_token` connector variable to be set, which can be configured in Rill through a fashion very similar to [setting credentials](/deploy/deploy-credentials#configure-environmental-variables-and-credentials-for-rill-cloud) for other connectors. Please use one of the available options below.
 
 ### Updating the `.env` file directly
 
diff --git a/docs/docs/home/FAQ.md b/docs/docs/home/FAQ.md
index 37db23a8fb1..c2ade079f6d 100644
--- a/docs/docs/home/FAQ.md
+++ b/docs/docs/home/FAQ.md
@@ -82,7 +82,7 @@ You need to [deploy your dashboard to Rill Cloud](https://docs.rilldata.com/depl
 Rill Cloud is where your deployed Rill project exists and can be shared to your colleagues, or end-users. For more information, please review [our documentation](https://docs.rilldata.com/concepts/developerVsCloud#rill-cloud).
 
 ### How do I deploy to Rill Cloud?
-You can deploy your project directly from the UI by selecting [the Deploy button](https://docs.rilldata.com/deploy/existing-project/#deploying-a-project-via-the-ui).
+You can deploy your project directly from the UI by selecting [the Deploy button](/deploy/deploy-dashboard/#deploying-a-project-from-rill-developer).
 
 <img src = '/img/deploy/existing-project/deploy-ui.gif' class='rounded-gif' />
 <br />
diff --git a/docs/docs/manage/project-management/variables-and-credentials.md b/docs/docs/manage/project-management/variables-and-credentials.md
index 9dc06923085..b1dd8f0a4db 100644
--- a/docs/docs/manage/project-management/variables-and-credentials.md
+++ b/docs/docs/manage/project-management/variables-and-credentials.md
@@ -4,13 +4,16 @@ sidebar_label: Variables and Credentials
 sidebar_position: 50
 ---
 
-The credentials in a deployed Rill Cloud projects can be managed on the Settings page or via the CLI. If you have yet to deploy your credentials, please follow the steps in our [deploy credentials page](/deploy/deploy-credentials#configure-environmental-variables-and-credentials-on-rill-cloud). 
+The credentials in a deployed Rill Cloud projects can be managed on the Settings page or via the CLI. If you have yet to deploy your credentials, please follow the steps in our [deploy credentials page](/deploy/deploy-credentials#configure-environmental-variables-and-credentials-for-rill-cloud). 
 
 ## Modifying Variables and Credentials via the Settings Page
+Upon deployment via Rill Developer, if you have populated your .env file, the contents will be visible as seen below. If there are no environmantal variables defined, please run `rill env configure` from your local CLI and Rill will automatically detect the sources that are used in your project and request the credentials. Once completed, the variables should be visible and editable from Rill Cloud. If you'd like to manually add the credentals, please see [our naming convention](#credentials-naming-schema) to get started. 
 
 ![img](/img/tutorials/admin/env-var-ui.png)
 
-### Adding / Editing Environmental Variables
+### Adding and Editing Environmental Variables / Importing a `.env` file
+Once your environmantal variables are added to Rill Cloud, they can be modfied as needed.
+
 ![img](/img/manage/var-and-creds/add-variable.png)
 
 :::tip Can't find the .env file?
@@ -20,7 +23,7 @@ Keyboard shortcut: Command + Shift + .
 
 ## Pushing and pulling credentials to / from Rill Cloud via the CLI
 
-If you have a project deployed to Rill Cloud, Rill provides the ability to **sync** the credentials between your local instance of Rill Developer and Rill cloud. This provides the ability to quickly reuse existing credentials, if configured, instead of having to manually input credentials each time. This can be accomplished by leveraging the `rill env push` and `rill env pull` CLI commands respectively.
+If you'd prefer to use the CLI to managed your credentials, this can be done by running the `rill env pull` to pull your deployed Rill Cloud project's variables locally, or `rill env push` to updated Rill Cloud project's variables.
 
 :::tip Avoid committing sensitive information to Git
 
@@ -57,7 +60,8 @@ Please note when you run `rill env pull`, Rill will *automatically override any
 
 ### Credentials Naming Schema 
 
-Connector credentials are essentially a form of project variable, prefixed using the `connector.<connector_name>.<property>` syntax. For example, `connector.druid.dsn` and `connector.clickhouse.dsn` are both hardcoded project variables (that happen to correspond to the [Druid](/reference/olap-engines/druid.md) and [ClickHouse](/reference/olap-engines/clickhouse.md) OLAP engines respectively). Please see below for each source and its required properties. 
+Connector credentials are essentially a form of project variable, prefixed using the `connector.<connector_name>.<property>` syntax. For example, `connector.druid.dsn` and `connector.clickhouse.dsn` are both hardcoded project variables (that happen to correspond to the [Druid](/reference/olap-engines/druid.md) and [ClickHouse](/reference/olap-engines/clickhouse.md) OLAP engines respectively). Please see below for each source and its required properties. If you have any questions or need specifics, [contact us](../../contact)! 
+
 
 
 <div
diff --git a/docs/docs/reference/project-files/sources.md b/docs/docs/reference/project-files/sources.md
index 62da1829512..7d5a6b94a04 100644
--- a/docs/docs/reference/project-files/sources.md
+++ b/docs/docs/reference/project-files/sources.md
@@ -103,7 +103,7 @@ Files that are *nested at any level* under your native `sources` directory will
 
 **`database_url`**
  — Postgres connection string that should be used. Refer to Postgres [documentation](https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING) for more details _(optional)_.
-  - If not specified in the source YAML, the `connector.postgres.database_url` connection string will need to be set when [deploying the project to Rill Cloud](/deploy/deploy-credentials#configure-environmental-variables-and-credentials-on-rill-cloud).
+  - If not specified in the source YAML, the `connector.postgres.database_url` connection string will need to be set when [deploying the project to Rill Cloud](/deploy/deploy-credentials#configure-environmental-variables-and-credentials-for-rill-cloud).
 
 **`duckdb`** – Specifies the raw parameters to inject into the DuckDB [`read_csv`](https://duckdb.org/docs/data/csv/overview.html), [`read_json`](https://duckdb.org/docs/data/json/overview.html) or [`read_parquet`](https://duckdb.org/docs/data/parquet/overview) statement that Rill generates internally _(optional)_. 
 
@@ -126,4 +126,4 @@ duckdb:
 ```
 
 **`dsn`** - Used to set the Snowflake connection string. For more information, refer to our [Snowflake connector page](/reference/connectors/snowflake.md) and the official [Go Snowflake Driver](https://pkg.go.dev/github.com/snowflakedb/gosnowflake#hdr-Connection_String) documentation _(optional)_.
-  - If not specified in the source YAML, the `connector.snowflake.dsn` connection string will need to be set when [deploying the project to Rill Cloud](/deploy/deploy-credentials#configure-environmental-variables-and-credentials-on-rill-cloud).
+  - If not specified in the source YAML, the `connector.snowflake.dsn` connection string will need to be set when [deploying the project to Rill Cloud](/deploy/deploy-credentials#configure-environmental-variables-and-credentials-for-rill-cloud).

From f13fc137e6a3c1668b3a725a711ef19180bcd4f6 Mon Sep 17 00:00:00 2001
From: Alexander Thor <alec.karlsson@gmail.com>
Date: Thu, 30 Jan 2025 17:32:07 +0100
Subject: [PATCH 29/48] docs: friendlier language (#6539)

---
 docs/docs/build/connect/connect.md |  2 +-
 docs/docs/build/models/models.md   |  6 +++---
 docs/docs/home/home.md             | 12 ++++++------
 docs/docs/tutorials/index.md       |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/docs/build/connect/connect.md b/docs/docs/build/connect/connect.md
index 55d54f00756..15bbd8eadbf 100644
--- a/docs/docs/build/connect/connect.md
+++ b/docs/docs/build/connect/connect.md
@@ -10,7 +10,7 @@ sidebar_position: 00
 <img src = '/img/tutorials/102/Adding-Data.gif' class='rounded-gif' />
 <br />
 
-Rill supports a multitude of connectors to ingest data from various sources: local files, S3 or GCS buckets, download using HTTP(S), databases, data warehouses, and the list goes on. Rill can ingest `.csv`, `.tsv`, `.json`,and `.parquet` files, which may be compressed (`.gz`). This can be done either through the UI directly, when working with Rill Developer, or by pushing the logic into the [source YAML](../../reference/project-files/sources.md) definition directly (see _Using Code_ sections below).
+Rill supports a multitude of connectors to ingest data from various sources: local files, S3 or GCS buckets, download using HTTP(S), databases, data warehouses, and the list goes on. Rill supports ingestion of `.csv`, `.tsv`, `.json`, and `.parquet` files, including compressed versions (`.gz`). This can be done either through the UI directly, when working with Rill Developer, or by pushing the logic into the [source YAML](../../reference/project-files/sources.md) definition directly (see _Using Code_ sections below).
 
 To provide a non-exhaustive list, Rill supports the following connectors:
 - [Google Cloud Storage](/reference/connectors/gcs.md)
diff --git a/docs/docs/build/models/models.md b/docs/docs/build/models/models.md
index 3fd832014e2..98feb9e3bde 100644
--- a/docs/docs/build/models/models.md
+++ b/docs/docs/build/models/models.md
@@ -8,8 +8,8 @@ sidebar_position: 00
 <img src = '/img/tutorials/102/Add-model.gif' class='rounded-gif' />
 <br />
 
-
-[Data models](/reference/project-files/models.md) in Rill are composed of SQL `SELECT` statements that operate on source data. They allow you to join, transform, and clean data.
+In Rill, [data models](/reference/project-files/models.md) are built using SQL `SELECT` statements applied to your source data.
+They allow you to join, transform, and clean data.
 
 ## SQL transformations
 
@@ -23,7 +23,7 @@ For additional tips on commonly used expressions (either in models or dashboard
 ## Adding a data model
 
 ### Using the UI
-To add a new data model using the UI, click "+" by Models in the left hand navigation pane. You can now begin typing a DuckDB SQL `SELECT` query for your model in the code editor – with keystroke-by-keystroke feedback.
+In the UI, add a new data model by clicking the '+' icon next to 'Models' in the left-hand navigation pane. You can now begin typing a DuckDB SQL `SELECT` query for your model in the code editor – with keystroke-by-keystroke feedback.
 
 ### Using code
 When you add a data model using the UI, a code definition will automatically be created as a `<model_name>.sql` file in the `models` folder in your Rill project.
diff --git a/docs/docs/home/home.md b/docs/docs/home/home.md
index a7553f3040c..99f8e941544 100644
--- a/docs/docs/home/home.md
+++ b/docs/docs/home/home.md
@@ -1,11 +1,11 @@
 ---
-title: Let's get started!
+title: Ready to embark on your Rill adventure? Let's dive in!
 slug: /
 sidebar_label: Welcome to Rill
 sidebar_position: 00
 hide_table_of_contents: true
 ---
-Use the following to download Rill and start your first project, my-rill-project.
+Install Rill using the command below, then launch your first project to explore core features hands-on.
 
 ```bash
 curl https://rill.sh | sh
@@ -31,7 +31,7 @@ The final project is available on our [example repository](https://github.com/ri
 
 ## Quick Starts & Examples
 
-If you need a reference point to get started, you can download our [example repository](https://github.com/rilldata/rill-examples/). 
+Explore our [example repository](https://github.com/rilldata/rill-examples/) to kickstart your project.
 
 Some of the included projects are:
 
@@ -45,12 +45,12 @@ Some of the included projects are:
 
 ## Release Notes
 
-If you need information on our latest releases, check out our [release notes!](https://docs.rilldata.com/notes)
+Curious about what's new? Peek into our latest and greatest updates in the [release notes!](https://docs.rilldata.com/notes)
 
 ## Don't be a stranger!
 We always appreciate hearing from our users and welcome any questions, comments, or concerns you may have. To get in touch with us, there are a few options available:
-1. _**File an issue**_: If you have encountered a bug or have a feature request, please [file an issue](https://github.com/rilldata/rill/issues/new/choose) on our GitHub page. 
-2. _**Join our Discord channel**_: For general inquiries or if you need help getting started with Rill, we encourage you to join our [Discord community](https://discord.gg/DJ5qcsxE2m).
+1. _**File an issue**_: Spotted a bug or have a brilliant idea? Let us know by [filing an issue](https://github.com/rilldata/rill/issues/new/choose) on GitHub.
+2. _**Join the party on Discord!**_ Whether you have questions or need a hand getting started, our community and Rill team members is here to help. Join us at [Discord](https://discord.gg/DJ5qcsxE2m).
 3. _**Contact Rill Support**_: For existing prospects and customers, you can also reach [Rill Support](contact.md#contacting-support) through Slack, email, and in-app chat. 
 
 :::info
diff --git a/docs/docs/tutorials/index.md b/docs/docs/tutorials/index.md
index a2ef4b4a584..ae45bce79b5 100644
--- a/docs/docs/tutorials/index.md
+++ b/docs/docs/tutorials/index.md
@@ -7,7 +7,7 @@ hide_table_of_contents: true
 
 # Welcome to Rill Tutorials!
 
-### Hi! We're excited to have you here!
+### Hey there! We're thrilled you've joined us on this Rill journey!
 
 These tutorials were built to help you get started with Rill and empower you to build your own projects. The journey from data import, SQL transformations, dashboard creation and finally deployment to Cloud. From there, looking at Rill Cloud specific features, pushing local changes to Rill Cloud, then finally developing custom features.
 

From e945c3c1f371497ec19d59e42555d2ec36634131 Mon Sep 17 00:00:00 2001
From: Brian Holmes <120223836+briangregoryholmes@users.noreply.github.com>
Date: Thu, 30 Jan 2025 13:18:46 -0500
Subject: [PATCH 30/48] fix: checkbox indicator lag (#6511)

* fix: checkbox indicator lag

* restore binding
---
 .../components/dropdown-menu/DropdownMenuCheckboxItem.svelte  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web-common/src/components/dropdown-menu/DropdownMenuCheckboxItem.svelte b/web-common/src/components/dropdown-menu/DropdownMenuCheckboxItem.svelte
index 37f011a240b..1c9e7577f66 100644
--- a/web-common/src/components/dropdown-menu/DropdownMenuCheckboxItem.svelte
+++ b/web-common/src/components/dropdown-menu/DropdownMenuCheckboxItem.svelte
@@ -49,13 +49,13 @@
     <span
       class="absolute left-2.5 flex h-3.5 w-3.5 items-center justify-center"
     >
-      <DropdownMenuPrimitive.CheckboxIndicator>
+      {#if checked}
         <svelte:component
           this={showXForSelected ? X : Check}
           class={checkSize}
           color={iconColor}
         />
-      </DropdownMenuPrimitive.CheckboxIndicator>
+      {/if}
     </span>
     <slot />
   </DropdownMenuPrimitive.CheckboxItem>

From c2b8107158fa3abdec0fedaee0b24c7d14a591d3 Mon Sep 17 00:00:00 2001
From: Aditya Hegde <adityahegderocks@gmail.com>
Date: Fri, 31 Jan 2025 10:42:08 +0530
Subject: [PATCH 31/48] feat: Show custom logo in UI (#6530)

* Show custom logo in UI

* Fix lint

* Move query options to selectors

* fix: padding and remove hover bg (#6544)

* Fix lint

---------

Co-authored-by: Alexander Thor <alec.karlsson@gmail.com>
---
 .../src/features/navigation/TopNavigationBar.svelte  | 11 +++++++++--
 web-admin/src/features/organizations/selectors.ts    |  9 +++++----
 web-admin/src/routes/+layout.svelte                  |  4 +++-
 web-admin/src/routes/+layout.ts                      | 12 +++++++++---
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/web-admin/src/features/navigation/TopNavigationBar.svelte b/web-admin/src/features/navigation/TopNavigationBar.svelte
index d8ed160b2f1..30c311fef4e 100644
--- a/web-admin/src/features/navigation/TopNavigationBar.svelte
+++ b/web-admin/src/features/navigation/TopNavigationBar.svelte
@@ -38,6 +38,7 @@
   export let manageOrganization: boolean;
   export let createMagicAuthTokens: boolean;
   export let manageProjectMembers: boolean;
+  export let organizationLogoUrl: string | undefined = undefined;
 
   const user = createAdminServiceGetCurrentUser();
 
@@ -189,9 +190,15 @@
   <!-- Left side -->
   <a
     href={rillLogoHref}
-    class="hover:bg-gray-200 grid place-content-center rounded p-2"
+    class="grid place-content-center rounded {organizationLogoUrl
+      ? 'pl-2 pr-2'
+      : 'p-2'}"
   >
-    <Rill />
+    {#if organizationLogoUrl}
+      <img src={organizationLogoUrl} alt="logo" class="h-7" />
+    {:else}
+      <Rill />
+    {/if}
   </a>
   {#if onPublicURLPage}
     <PageTitle title={publicURLDashboardTitle} />
diff --git a/web-admin/src/features/organizations/selectors.ts b/web-admin/src/features/organizations/selectors.ts
index 84640e8c29e..cd0978cbbc5 100644
--- a/web-admin/src/features/organizations/selectors.ts
+++ b/web-admin/src/features/organizations/selectors.ts
@@ -4,8 +4,10 @@ import {
   createAdminServiceListProjectsForOrganization,
   getAdminServiceGetOrganizationQueryKey,
   getAdminServiceListProjectsForOrganizationQueryKey,
+  type V1GetOrganizationResponse,
 } from "@rilldata/web-admin/client";
 import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
+import type { FetchQueryOptions } from "@tanstack/query-core";
 
 export function areAllProjectsHibernating(organization: string) {
   return createAdminServiceListProjectsForOrganization(
@@ -31,11 +33,10 @@ export async function fetchAllProjectsHibernating(organization: string) {
   return projectsResp.projects?.every((p) => !p.prodDeploymentId) ?? false;
 }
 
-export async function fetchOrganizationPermissions(organization: string) {
-  const orgResp = await queryClient.fetchQuery({
+export function getFetchOrganizationQueryOptions(organization: string) {
+  return <FetchQueryOptions<V1GetOrganizationResponse>>{
     queryKey: getAdminServiceGetOrganizationQueryKey(organization),
     queryFn: () => adminServiceGetOrganization(organization),
     staleTime: Infinity,
-  });
-  return orgResp.permissions ?? {};
+  };
 }
diff --git a/web-admin/src/routes/+layout.svelte b/web-admin/src/routes/+layout.svelte
index d3586adb47c..c81ca7d3c2e 100644
--- a/web-admin/src/routes/+layout.svelte
+++ b/web-admin/src/routes/+layout.svelte
@@ -25,7 +25,8 @@
 
   export let data;
 
-  $: ({ projectPermissions, organizationPermissions } = data);
+  $: ({ projectPermissions, organizationPermissions, organizationLogoUrl } =
+    data);
   $: ({
     params: { organization },
     url: { pathname },
@@ -89,6 +90,7 @@
           manageOrganization={organizationPermissions?.manageOrg}
           createMagicAuthTokens={projectPermissions?.createMagicAuthTokens}
           manageProjectMembers={projectPermissions?.manageProjectMembers}
+          {organizationLogoUrl}
         />
 
         {#if withinOnlyOrg}
diff --git a/web-admin/src/routes/+layout.ts b/web-admin/src/routes/+layout.ts
index 756ba3fbb16..b543bc9670c 100644
--- a/web-admin/src/routes/+layout.ts
+++ b/web-admin/src/routes/+layout.ts
@@ -15,7 +15,7 @@ import {
   type V1User,
 } from "@rilldata/web-admin/client";
 import { redirectToLoginOrRequestAccess } from "@rilldata/web-admin/features/authentication/checkUserAccess";
-import { fetchOrganizationPermissions } from "@rilldata/web-admin/features/organizations/selectors";
+import { getFetchOrganizationQueryOptions } from "@rilldata/web-admin/features/organizations/selectors";
 import { fetchProjectDeploymentDetails } from "@rilldata/web-admin/features/projects/selectors";
 import { initPosthog } from "@rilldata/web-common/lib/analytics/posthog";
 import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient.js";
@@ -75,10 +75,14 @@ export const load = async ({ params, url, route }) => {
 
   // Get organization permissions
   let organizationPermissions: V1OrganizationPermissions = {};
+  let organizationLogoUrl: string | undefined = undefined;
   if (organization && !token) {
     try {
-      organizationPermissions =
-        await fetchOrganizationPermissions(organization);
+      const organizationResp = await queryClient.fetchQuery(
+        getFetchOrganizationQueryOptions(organization),
+      );
+      organizationPermissions = organizationResp.permissions ?? {};
+      organizationLogoUrl = organizationResp.organization?.logoUrl;
     } catch (e) {
       if (e.response?.status !== 403) {
         throw error(e.response.status, "Error fetching organization");
@@ -90,6 +94,7 @@ export const load = async ({ params, url, route }) => {
     return {
       user,
       organizationPermissions,
+      organizationLogoUrl,
       projectPermissions: <V1ProjectPermissions>{},
     };
   }
@@ -112,6 +117,7 @@ export const load = async ({ params, url, route }) => {
     return {
       user,
       organizationPermissions,
+      organizationLogoUrl,
       projectPermissions,
       project: proj,
       runtime: runtimeData,

From 641cddf2d8e09992dc3d746ba9b79ff660ebefd0 Mon Sep 17 00:00:00 2001
From: Anshul Khandelwal <12948312+k-anshul@users.noreply.github.com>
Date: Fri, 31 Jan 2025 10:36:48 +0100
Subject: [PATCH 32/48] reduce the amount of data that needs to be kept in
 memory while downloading data as parquet files (#6548)

---
 runtime/drivers/bigquery/warehouse.go  | 6 ++++--
 runtime/drivers/snowflake/warehouse.go | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/runtime/drivers/bigquery/warehouse.go b/runtime/drivers/bigquery/warehouse.go
index da6cac71f04..702cd6ae109 100644
--- a/runtime/drivers/bigquery/warehouse.go
+++ b/runtime/drivers/bigquery/warehouse.go
@@ -24,8 +24,10 @@ import (
 	"google.golang.org/api/option"
 )
 
-// recommended size is 512MB - 1GB, entire data is buffered in memory before its written to disk
-const rowGroupBufferSize = int64(datasize.MB) * 512
+// entire data is buffered in memory before its written to disk so keeping it small reduces memory usage
+// but keeping it too small can lead to bad ingestion performance
+// 64MB seems to be a good balance
+const rowGroupBufferSize = int64(datasize.MB) * 64
 
 const _jsonDownloadLimitBytes = 100 * int64(datasize.MB)
 
diff --git a/runtime/drivers/snowflake/warehouse.go b/runtime/drivers/snowflake/warehouse.go
index 5c891c64517..8e3fe2729ed 100644
--- a/runtime/drivers/snowflake/warehouse.go
+++ b/runtime/drivers/snowflake/warehouse.go
@@ -24,8 +24,10 @@ import (
 	"golang.org/x/sync/errgroup"
 )
 
-// recommended size is 512MB - 1GB, entire data is buffered in memory before its written to disk
-const rowGroupBufferSize = int64(datasize.MB) * 512
+// entire data is buffered in memory before its written to disk so keeping it small reduces memory usage
+// but keeping it too small can lead to bad ingestion performance
+// 64MB seems to be a good balance
+const rowGroupBufferSize = int64(datasize.MB) * 64
 
 // QueryAsFiles implements drivers.SQLStore.
 // Fetches query result in arrow batches.
@@ -46,7 +48,7 @@ func (c *connection) QueryAsFiles(ctx context.Context, props map[string]any) (it
 		return nil, fmt.Errorf("the property 'dsn' is required for Snowflake. Provide 'dsn' in the YAML properties or pass '--env connector.snowflake.dsn=...' to 'rill start'")
 	}
 
-	parallelFetchLimit := 15
+	parallelFetchLimit := 5
 	if c.configProperties.ParallelFetchLimit != 0 {
 		parallelFetchLimit = c.configProperties.ParallelFetchLimit
 	}

From af9a57088fc5a83f8e7b078fc94c3ef0a1043f23 Mon Sep 17 00:00:00 2001
From: Alexander Thor <alec.karlsson@gmail.com>
Date: Fri, 31 Jan 2025 11:45:21 +0100
Subject: [PATCH 33/48] fix: removes search for listings in cloud (#6551)

---
 web-admin/src/components/table/Table.svelte              | 9 ++++++---
 .../src/features/alerts/history/AlertHistoryTable.svelte | 1 +
 .../scheduled-reports/history/ReportHistoryTable.svelte  | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/web-admin/src/components/table/Table.svelte b/web-admin/src/components/table/Table.svelte
index f96a5766f3d..01fb255956c 100644
--- a/web-admin/src/components/table/Table.svelte
+++ b/web-admin/src/components/table/Table.svelte
@@ -16,6 +16,7 @@
   export let columns: ColumnDef<unknown, unknown>[] = [];
   export let columnVisibility: Record<string, boolean> = {};
   export let kind: string;
+  export let toolbar: boolean = true;
 
   const dispatch = createEventDispatcher();
 
@@ -72,9 +73,11 @@
   $: data && rerender();
 </script>
 
-<slot name="toolbar">
-  <Toolbar />
-</slot>
+{#if toolbar}
+  <slot name="toolbar">
+    <Toolbar />
+  </slot>
+{/if}
 
 <table class="w-full">
   <slot name="header" />
diff --git a/web-admin/src/features/alerts/history/AlertHistoryTable.svelte b/web-admin/src/features/alerts/history/AlertHistoryTable.svelte
index f2444104a4f..9480a47c2b4 100644
--- a/web-admin/src/features/alerts/history/AlertHistoryTable.svelte
+++ b/web-admin/src/features/alerts/history/AlertHistoryTable.svelte
@@ -51,6 +51,7 @@
       kind="alert"
       {columns}
       data={$alertQuery.data?.resource.alert.state.executionHistory}
+      toolbar={false}
     >
       <AlertHistoryTableHeader slot="header" />
     </Table>
diff --git a/web-admin/src/features/scheduled-reports/history/ReportHistoryTable.svelte b/web-admin/src/features/scheduled-reports/history/ReportHistoryTable.svelte
index f79342e2e2d..466c24ee33f 100644
--- a/web-admin/src/features/scheduled-reports/history/ReportHistoryTable.svelte
+++ b/web-admin/src/features/scheduled-reports/history/ReportHistoryTable.svelte
@@ -50,6 +50,7 @@
       kind="report"
       {columns}
       data={$reportQuery.data?.resource.report.state.executionHistory}
+      toolbar={false}
     >
       <ReportHistoryTableHeader slot="header" />
     </Table>

From 17a02de56eb3776b8fdeb448fe530154215470f0 Mon Sep 17 00:00:00 2001
From: Alexander Thor <alec.karlsson@gmail.com>
Date: Fri, 31 Jan 2025 11:59:58 +0100
Subject: [PATCH 34/48] fix: dont show warning when not switching model (#6552)

---
 web-common/src/features/workspaces/VisualMetrics.svelte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web-common/src/features/workspaces/VisualMetrics.svelte b/web-common/src/features/workspaces/VisualMetrics.svelte
index f7fc62e7958..6d35673899a 100644
--- a/web-common/src/features/workspaces/VisualMetrics.svelte
+++ b/web-common/src/features/workspaces/VisualMetrics.svelte
@@ -581,6 +581,7 @@
             placeholder="Select a model"
             label="Model"
             onChange={async (newModelOrSourceName) => {
+              if (modelOrSourceOrTableName === newModelOrSourceName) return;
               if (!modelOrSourceOrTableName) {
                 updateProperties({ model: newModelOrSourceName }, [
                   "table",

From bd1ab41f6be5abe53f23a8b60cafbf2c3f91553a Mon Sep 17 00:00:00 2001
From: Cyrus Goh <hello@cyrusgoh.com>
Date: Fri, 31 Jan 2025 05:46:06 -0800
Subject: [PATCH 35/48] Environment variables: input validation to protect
 against duplicate variables (#6507)

* dup check for form envs #6475

* draft instead of internal

* lint
---
 .../environment-variables/AddDialog.svelte    | 70 ++++++++++++++-----
 1 file changed, 54 insertions(+), 16 deletions(-)

diff --git a/web-admin/src/features/projects/environment-variables/AddDialog.svelte b/web-admin/src/features/projects/environment-variables/AddDialog.svelte
index c413a2268ae..6adbb63414c 100644
--- a/web-admin/src/features/projects/environment-variables/AddDialog.svelte
+++ b/web-admin/src/features/projects/environment-variables/AddDialog.svelte
@@ -32,7 +32,7 @@
   export let open = false;
   export let variableNames: VariableNames = [];
 
-  let inputErrors: { [key: number]: boolean } = {};
+  let inputErrors: { [key: number]: { type: string } } = {};
   let isKeyAlreadyExists = false;
   let isDevelopment = true;
   let isProduction = true;
@@ -42,7 +42,7 @@
   $: organization = $page.params.organization;
   $: project = $page.params.project;
 
-  $: hasExistingKeys = Object.values(inputErrors).some((error) => error);
+  $: hasExistingKeys = Object.keys(inputErrors).length > 0;
   $: hasNewChanges = $form.variables.some(
     (variable) => variable.key !== "" || variable.value !== "",
   );
@@ -74,7 +74,7 @@
     }),
   );
 
-  const { form, enhance, submit, submitting, errors, allErrors } = superForm(
+  const { form, enhance, submit, submitting, allErrors } = superForm(
     defaults(initialValues, schema),
     {
       SPA: true,
@@ -171,7 +171,30 @@
   function checkForExistingKeys() {
     inputErrors = {};
     isKeyAlreadyExists = false;
+    let isDuplicateWithinForm = false;
+    let isDuplicateWithExisting = false;
 
+    // First check for duplicates within the form
+    const formKeys = $form.variables
+      .filter((variable) => variable.key.trim() !== "")
+      .map((variable) => variable.key);
+
+    const formDuplicates = new Set();
+    // Check for duplicates using Set
+    if (new Set(formKeys).size !== formKeys.length) {
+      // Find indices of duplicate keys
+      formKeys.forEach((key, index) => {
+        if (formKeys.indexOf(key) !== index) {
+          // Mark both the original and duplicate entries as errors
+          formDuplicates.add(formKeys.indexOf(key));
+          formDuplicates.add(index);
+          isDuplicateWithinForm = true;
+        }
+      });
+    }
+
+    // Then check against existing variables
+    const existingDuplicates = new Set();
     const existingKeys = $form.variables
       .filter((variable) => variable.key.trim() !== "")
       .map((variable) => {
@@ -181,8 +204,7 @@
         };
       });
 
-    let duplicateCount = 0;
-    existingKeys.forEach((key, _idx) => {
+    existingKeys.forEach((key, _) => {
       const variableEnvironment = key.environment;
       const variableKey = key.name;
 
@@ -190,13 +212,22 @@
         const originalIndex = $form.variables.findIndex(
           (v) => v.key === variableKey,
         );
-        inputErrors[originalIndex] = true;
-        isKeyAlreadyExists = true;
-        duplicateCount++;
+        existingDuplicates.add(originalIndex);
+        isDuplicateWithExisting = true;
       }
     });
 
-    return duplicateCount;
+    // Combine the errors
+    formDuplicates.forEach((index: number) => {
+      inputErrors[index] = { type: "draft" };
+    });
+    existingDuplicates.forEach((index: number) => {
+      inputErrors[index] = { type: "existing" };
+    });
+
+    isKeyAlreadyExists = isDuplicateWithinForm || isDuplicateWithExisting;
+
+    return formDuplicates.size + existingDuplicates.size;
   }
 
   function handleFileUpload(event: Event) {
@@ -330,10 +361,8 @@
                   bind:value={variable.key}
                   id={`key-${index}`}
                   label=""
-                  textClass={inputErrors[index] ||
-                  ($errors.variables &&
-                    $errors.variables[index] &&
-                    $errors.variables[index].key)
+                  textClass={inputErrors[index] &&
+                  inputErrors[index].type === "draft"
                     ? "error-input-wrapper"
                     : ""}
                   placeholder="Key"
@@ -384,9 +413,18 @@
             {#if isKeyAlreadyExists}
               <div class="mt-1">
                 <p class="text-xs text-red-600 font-normal">
-                  {Object.keys(inputErrors).length > 1
-                    ? "These keys already exist for your target environment(s)"
-                    : "This key already exists for your target environment(s)"}
+                  {#if Object.values(inputErrors).every((err) => err.type === "draft")}
+                    {Object.keys(inputErrors).length > 1
+                      ? "Duplicate keys are not allowed"
+                      : "This key is duplicated"}
+                  {:else if Object.values(inputErrors).every((err) => err.type === "existing")}
+                    {Object.keys(inputErrors).length > 1
+                      ? "These keys already exist for your target environment(s)"
+                      : "This key already exists for your target environment(s)"}
+                  {:else}
+                    Some keys are duplicated or already exist in target
+                    environment(s)
+                  {/if}
                 </p>
               </div>
             {/if}

From 6729ee9525526a1351704967413695d47751c56b Mon Sep 17 00:00:00 2001
From: Graham Plata <graham.plata@gmail.com>
Date: Fri, 31 Jan 2025 09:21:13 -0500
Subject: [PATCH 36/48] handle multiple errors and flush to opentel callback
 (#6545)

---
 runtime/pkg/observability/observability.go | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/runtime/pkg/observability/observability.go b/runtime/pkg/observability/observability.go
index 915e8416521..a7eb2c3119e 100644
--- a/runtime/pkg/observability/observability.go
+++ b/runtime/pkg/observability/observability.go
@@ -128,17 +128,27 @@ func Start(ctx context.Context, logger *zap.Logger, opts *Options) (ShutdownFunc
 
 	// Create callback to shut down globals
 	shutdown := func(ctx context.Context) error {
-		var err1, err2 error
+		var errs []error
 		if meterProvider != nil {
-			err1 = meterProvider.Shutdown(ctx)
+			if err := meterProvider.Shutdown(ctx); err != nil {
+				errs = append(errs, err)
+			}
 		}
 		if tracerProvider != nil {
-			err2 = tracerProvider.Shutdown(ctx)
+			if err := tracerProvider.ForceFlush(ctx); err != nil {
+				errs = append(errs, fmt.Errorf("failed to flush spans: %w", err))
+			}
+			if err := tracerProvider.Shutdown(ctx); err != nil {
+				errs = append(errs, err)
+			}
 		}
-		if err1 != nil {
-			return err1
+		if len(errs) == 1 {
+			return fmt.Errorf("error while shutting down: %w", errs[0])
 		}
-		return err2
+		if len(errs) > 1 {
+			return fmt.Errorf("multiple errors while shutting down: %v", errs)
+		}
+		return nil
 	}
 	return shutdown, nil
 }

From 97487a08f3e9e8152d2254e5650fe346b24a39c4 Mon Sep 17 00:00:00 2001
From: Graham Plata <graham.plata@gmail.com>
Date: Fri, 31 Jan 2025 09:29:47 -0500
Subject: [PATCH 37/48] Add Organization email and plan to init logs (#6519)

* fix typo

* add logs

* add org id
---
 admin/billing.go                          | 39 ++++++++++++++++++++---
 admin/database/database.go                |  1 +
 admin/database/postgres/postgres.go       | 23 +++++++++----
 admin/jobs/jobs.go                        |  2 +-
 admin/jobs/river/subscription_handlers.go |  9 +++++-
 admin/jobs/river/trial_checks.go          | 21 +++++++++++-
 admin/projects.go                         | 13 ++++++--
 admin/server/billing.go                   | 23 +++++++++++--
 8 files changed, 112 insertions(+), 19 deletions(-)

diff --git a/admin/billing.go b/admin/billing.go
index cca8d395c2e..18ee0df241e 100644
--- a/admin/billing.go
+++ b/admin/billing.go
@@ -19,7 +19,13 @@ func (s *Service) InitOrganizationBilling(ctx context.Context, org *database.Org
 	if err != nil {
 		return nil, err
 	}
-	s.Logger.Info("created payment customer", zap.String("org_id", org.ID), zap.String("org_name", org.Name), zap.String("payment_customer_id", pc.ID))
+	s.Logger.Info("created payment customer",
+		zap.String("org_id", org.ID),
+		zap.String("org_name", org.Name),
+		zap.String("payment_customer_id", pc.ID),
+		zap.String("user_email", org.BillingEmail),
+	)
+
 	org.PaymentCustomerID = pc.ID
 
 	// create billing customer
@@ -27,7 +33,14 @@ func (s *Service) InitOrganizationBilling(ctx context.Context, org *database.Org
 	if err != nil {
 		return nil, err
 	}
-	s.Logger.Info("created billing customer", zap.String("org", org.Name), zap.String("billing_customer_id", bc.ID))
+	s.Logger.Info("created billing customer",
+		zap.String("org", org.Name),
+		zap.String("org_id", org.ID),
+		zap.String("billing_customer_id", bc.ID),
+		zap.String("payment_customer_id", pc.ID),
+		zap.String("user_email", org.BillingEmail),
+	)
+
 	org.BillingCustomerID = bc.ID
 
 	org, err = s.DB.UpdateOrganization(ctx, org.ID, &database.UpdateOrganizationOptions{
@@ -90,7 +103,12 @@ func (s *Service) RepairOrganizationBilling(ctx context.Context, org *database.O
 				if err != nil {
 					return nil, nil, fmt.Errorf("failed to create payment customer: %w", err)
 				}
-				s.Logger.Info("created payment customer", zap.String("org_id", org.ID), zap.String("org_name", org.Name), zap.String("payment_customer_id", pc.ID))
+				s.Logger.Info("created payment customer",
+					zap.String("org_id", org.ID),
+					zap.String("org_name", org.Name),
+					zap.String("payment_customer_id", pc.ID),
+					zap.String("user_email", pc.Email),
+				)
 			} else {
 				return nil, nil, fmt.Errorf("error finding payment customer: %w", err)
 			}
@@ -110,7 +128,13 @@ func (s *Service) RepairOrganizationBilling(ctx context.Context, org *database.O
 		if err != nil {
 			return nil, nil, fmt.Errorf("failed to create billing customer: %w", err)
 		}
-		s.Logger.Info("created billing customer", zap.String("org_id", org.ID), zap.String("org_name", org.Name), zap.String("billing_customer_id", bc.ID))
+		s.Logger.Info("created billing customer",
+			zap.String("org_id", org.ID),
+			zap.String("org_name", org.Name),
+			zap.String("billing_customer_id", bc.Email),
+			zap.String("payment_customer_id", org.PaymentCustomerID),
+			zap.String("user_email", org.BillingEmail),
+		)
 		org.BillingCustomerID = bc.ID
 	} else if bc.PaymentProviderID == "" {
 		// update payment customer id in billing system
@@ -244,7 +268,12 @@ func (s *Service) StartTrial(ctx context.Context, org *database.Organization) (*
 		return org, sub, nil
 	}
 
-	s.Logger.Named("billing").Info("started trial for organization", zap.String("org_name", org.Name), zap.String("org_id", org.ID), zap.String("trial_end_date", sub.TrialEndDate.String()))
+	s.Logger.Named("billing").Info("started trial for organization",
+		zap.String("org_name", org.Name),
+		zap.String("org_id", org.ID),
+		zap.String("trial_end_date", sub.TrialEndDate.String()),
+		zap.String("email", *org.CreatedByUserID),
+	)
 
 	org, err = s.DB.UpdateOrganization(ctx, org.ID, &database.UpdateOrganizationOptions{
 		Name:                                org.Name,
diff --git a/admin/database/database.go b/admin/database/database.go
index 3259c551990..93541b007af 100644
--- a/admin/database/database.go
+++ b/admin/database/database.go
@@ -89,6 +89,7 @@ type DB interface {
 	InsertProject(ctx context.Context, opts *InsertProjectOptions) (*Project, error)
 	DeleteProject(ctx context.Context, id string) error
 	UpdateProject(ctx context.Context, id string, opts *UpdateProjectOptions) (*Project, error)
+	CountProjectsForOrganization(ctx context.Context, orgID string) (int, error)
 	CountProjectsQuotaUsage(ctx context.Context, orgID string) (*ProjectsQuotaUsage, error)
 	FindProjectWhitelistedDomain(ctx context.Context, projectID, domain string) (*ProjectWhitelistedDomain, error)
 	FindProjectWhitelistedDomainForProjectWithJoinedRoleNames(ctx context.Context, projectID string) ([]*ProjectWhitelistedDomainWithJoinedRoleNames, error)
diff --git a/admin/database/postgres/postgres.go b/admin/database/postgres/postgres.go
index 16f195dc8f4..de6a34cb749 100644
--- a/admin/database/postgres/postgres.go
+++ b/admin/database/postgres/postgres.go
@@ -103,6 +103,15 @@ func (c *connection) FindOrganizationByName(ctx context.Context, name string) (*
 	return res, nil
 }
 
+func (c *connection) CountProjectsForOrganization(ctx context.Context, orgID string) (int, error) {
+	var count int
+	err := c.getDB(ctx).SelectContext(ctx, &count, "SELECT COUNT(*) FROM projects WHERE org_id=$1", orgID)
+	if err != nil {
+		return 0, parseErr("projects", err)
+	}
+	return count, nil
+}
+
 func (c *connection) FindOrganizationByCustomDomain(ctx context.Context, domain string) (*database.Organization, error) {
 	res := &database.Organization{}
 	err := c.getDB(ctx).QueryRowxContext(ctx, "SELECT * FROM orgs WHERE lower(custom_domain)=lower($1)", domain).StructScan(res)
@@ -1951,7 +1960,7 @@ func (c *connection) FindUnusedAssets(ctx context.Context, limit int) ([]*databa
 	// We skip unused assets created in last 6 hours to prevent race condition
 	// where somebody just created an asset but is yet to use it
 	err := c.getDB(ctx).SelectContext(ctx, &res, `
-		SELECT a.* FROM assets a 
+		SELECT a.* FROM assets a
 		WHERE a.created_on < now() - INTERVAL '6 hours'
 		AND NOT EXISTS (SELECT 1 FROM projects p WHERE p.archive_asset_id = a.id)
 		AND NOT EXISTS (SELECT 1 FROM orgs o WHERE o.logo_asset_id = a.id)
@@ -2131,14 +2140,14 @@ func (c *connection) FindProjectVariables(ctx context.Context, projectID string,
 		// Also include variables that are not environment specific and not set for the given environment
 		q += `
 			AND (
-				p.environment = $2 
+				p.environment = $2
 				OR (
-					p.environment = '' 
+					p.environment = ''
 					AND NOT EXISTS (
-						SELECT 1 
-						FROM project_variables p2 
-						WHERE p2.project_id = p.project_id 
-						AND p2.environment = $2 
+						SELECT 1
+						FROM project_variables p2
+						WHERE p2.project_id = p.project_id
+						AND p2.environment = $2
 						AND lower(p2.name) = lower(p.name)
 					)
 				)
diff --git a/admin/jobs/jobs.go b/admin/jobs/jobs.go
index 990ee86b01e..ac00fb5376b 100644
--- a/admin/jobs/jobs.go
+++ b/admin/jobs/jobs.go
@@ -22,7 +22,7 @@ type Client interface {
 	PaymentFailed(ctx context.Context, billingCustomerID, invoiceID, invoiceNumber, invoiceURL, amount, currency string, dueDate, failedAt time.Time) (*InsertResult, error)
 	PaymentSuccess(ctx context.Context, billingCustomerID, invoiceID string) (*InsertResult, error)
 
-	// org related joba
+	// org related jobs
 	InitOrgBilling(ctx context.Context, orgID string) (*InsertResult, error)
 	RepairOrgBilling(ctx context.Context, orgID string) (*InsertResult, error) // biller is just used for deduplication
 	StartOrgTrial(ctx context.Context, orgID string) (*InsertResult, error)
diff --git a/admin/jobs/river/subscription_handlers.go b/admin/jobs/river/subscription_handlers.go
index d26e93bab46..6040c302e18 100644
--- a/admin/jobs/river/subscription_handlers.go
+++ b/admin/jobs/river/subscription_handlers.go
@@ -89,11 +89,13 @@ func (w *SubscriptionCancellationCheckWorker) subscriptionCancellationCheck(ctx
 		// hibernate projects
 		limit := 10
 		afterProjectName := ""
+		projectCount := 0
 		for {
 			projs, err := w.admin.DB.FindProjectsForOrganization(ctx, org.ID, afterProjectName, limit)
 			if err != nil {
 				return err
 			}
+			projectCount += len(projs)
 
 			for _, proj := range projs {
 				_, err = w.admin.HibernateProject(ctx, proj)
@@ -118,7 +120,12 @@ func (w *SubscriptionCancellationCheckWorker) subscriptionCancellationCheck(ctx
 			w.logger.Error("failed to send subscription ended email", zap.String("org_id", org.ID), zap.String("org_name", org.Name), zap.String("billing_email", org.BillingEmail), zap.Error(err))
 		}
 
-		w.logger.Warn("projects hibernated due to subscription cancellation", zap.String("org_id", org.ID), zap.String("org_name", org.Name))
+		w.logger.Warn("projects hibernated due to subscription cancellation",
+			zap.String("org_id", org.ID),
+			zap.String("org_name", org.Name),
+			zap.Int("count_of_projects", projectCount),
+			zap.String("user_email", org.BillingEmail),
+		)
 
 		// mark the billing issue as processed
 		err = w.admin.DB.UpdateBillingIssueOverdueAsProcessed(ctx, issue.ID)
diff --git a/admin/jobs/river/trial_checks.go b/admin/jobs/river/trial_checks.go
index 1cc387a698d..db65b96c2ea 100644
--- a/admin/jobs/river/trial_checks.go
+++ b/admin/jobs/river/trial_checks.go
@@ -51,7 +51,26 @@ func (w *TrialEndingSoonWorker) trialEndingSoon(ctx context.Context) error {
 			return fmt.Errorf("failed to find organization: %w", err)
 		}
 
-		w.logger.Warn("trial ending soon", zap.String("org_id", org.ID), zap.String("org_name", org.Name), zap.Time("trial_end_date", m.EndDate))
+		// remaining days in the trial period
+		daysRemaining := int(m.EndDate.Sub(time.Now().UTC()).Hours() / 24)
+		if daysRemaining < 0 {
+			daysRemaining = 0
+		}
+
+		// number of projects for the org
+		projects, err := w.admin.DB.CountProjectsForOrganization(ctx, org.ID)
+		if err != nil {
+			return fmt.Errorf("failed to count projects for org %q: %w", org.Name, err)
+		}
+
+		w.logger.Warn("trial ending soon",
+			zap.String("org_id", org.ID),
+			zap.String("org_name", org.Name),
+			zap.Time("trial_end_date", m.EndDate),
+			zap.String("user_email", org.BillingEmail),
+			zap.Int("count_of_projects", projects),
+			zap.Int("count_of_days_remaining", daysRemaining),
+		)
 
 		err = w.admin.Email.SendTrialEndingSoon(&email.TrialEndingSoon{
 			ToEmail:      org.BillingEmail,
diff --git a/admin/projects.go b/admin/projects.go
index a1026229e39..0547469b7ce 100644
--- a/admin/projects.go
+++ b/admin/projects.go
@@ -108,8 +108,17 @@ func (s *Service) CreateProject(ctx context.Context, org *database.Organization,
 		return nil, multierr.Combine(err, err2, err3)
 	}
 
-	// Log project creation
-	s.Logger.Info("created project", zap.String("id", proj.ID), zap.String("name", proj.Name), zap.String("org", org.Name), zap.Any("user_id", opts.CreatedByUserID))
+	user, err := s.DB.FindUser(ctx, *proj.CreatedByUserID)
+	if err != nil {
+		return nil, err
+	}
+
+	plan, err := s.Biller.GetDefaultPlan(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	s.Logger.Info("created project", zap.String("id", proj.ID), zap.String("name", proj.Name), zap.String("org", org.Name), zap.Any("user_id", opts.CreatedByUserID), zap.String("user_email", user.Email), zap.String("billing_plan", plan.Name))
 
 	return res, nil
 }
diff --git a/admin/server/billing.go b/admin/server/billing.go
index 02dd225ae8c..f360ad1bb5f 100644
--- a/admin/server/billing.go
+++ b/admin/server/billing.go
@@ -173,7 +173,12 @@ func (s *Server) UpdateBillingSubscription(ctx context.Context, req *adminv1.Upd
 			return nil, err
 		}
 		planChange = true
-		s.logger.Named("billing").Info("new subscription created", zap.String("org_id", org.ID), zap.String("org_name", org.Name), zap.String("plan_id", sub.Plan.ID), zap.String("plan_name", sub.Plan.Name))
+		s.logger.Named("billing").Info("new subscription created",
+			zap.String("org_id", org.ID),
+			zap.String("org_name", org.Name),
+			zap.String("plan_id", sub.Plan.ID),
+			zap.String("plan_name", sub.Plan.Name),
+		)
 	} else {
 		// schedule plan change
 		oldPlan := sub.Plan
@@ -183,7 +188,14 @@ func (s *Server) UpdateBillingSubscription(ctx context.Context, req *adminv1.Upd
 				return nil, err
 			}
 			planChange = true
-			s.logger.Named("billing").Info("plan changed", zap.String("org_id", org.ID), zap.String("org_name", org.Name), zap.String("old_plan_id", oldPlan.ID), zap.String("old_plan_name", oldPlan.Name), zap.String("new_plan_id", sub.Plan.ID), zap.String("new_plan_name", sub.Plan.Name))
+			s.logger.Named("billing").Info("plan changed",
+				zap.String("org_id", org.ID),
+				zap.String("org_name", org.Name),
+				zap.String("old_plan_id", oldPlan.ID),
+				zap.String("old_plan_name", oldPlan.Name),
+				zap.String("new_plan_id", sub.Plan.ID),
+				zap.String("new_plan_name", sub.Plan.Name),
+			)
 		}
 	}
 
@@ -196,6 +208,13 @@ func (s *Server) UpdateBillingSubscription(ctx context.Context, req *adminv1.Upd
 		// send plan changed email
 
 		if plan.PlanType == billing.TeamPlanType {
+			s.logger.Named("billing").Info("upgraded to team plan",
+				zap.String("org_id", org.ID),
+				zap.String("org_name", org.Name),
+				zap.String("plan_id", sub.Plan.ID),
+				zap.String("plan_name", sub.Plan.Name),
+			)
+
 			// special handling for team plan to send custom email
 			err = s.admin.Email.SendTeamPlanStarted(&email.TeamPlan{
 				ToEmail:          org.BillingEmail,

From 569c023b2ae629e54341b03191b9ccceb162c52f Mon Sep 17 00:00:00 2001
From: Brian Holmes <120223836+briangregoryholmes@users.noreply.github.com>
Date: Fri, 31 Jan 2025 11:18:14 -0500
Subject: [PATCH 38/48] chore: class cleanup (#6498)

* chore: class cleanup

* add background class
---
 web-admin/src/routes/+layout.svelte           |  2 +-
 web-common/src/app.css                        | 66 +++++++------------
 web-common/src/components/BarAndLabel.svelte  | 12 ++--
 .../alert-dialog/alert-dialog-content.svelte  |  2 +-
 .../alert-dialog/button-variants.ts           |  2 +-
 .../src/components/button/IconButton.svelte   |  2 +-
 .../src/components/button/Switch.svelte       |  3 +-
 .../src/components/combobox/Combobox.svelte   |  2 +-
 .../data-graphic/guides/Axis.svelte           |  4 +-
 .../data-graphic/guides/Grid.svelte           |  4 +-
 .../marks/MultiMetricMouseoverLabel.svelte    |  6 +-
 .../dialog-v2/dialog-content.svelte           |  2 +-
 .../components/dialog/tabs/TabsTrigger.svelte |  2 +-
 web-common/src/components/forms/Input.svelte  |  2 +-
 web-common/src/components/forms/Switch.svelte |  2 +-
 .../components/select/select-trigger.svelte   |  2 +-
 .../src/components/table/BasicTable.svelte    |  2 +-
 .../virtualized-table/core/Cell.svelte        |  4 +-
 .../column-types/details/TopKListItem.svelte  |  2 +-
 .../connectors/olap/TableEntry.svelte         |  2 +-
 .../ViewAsButton.svelte                       |  2 +-
 .../leaderboard/LeaderboardRow.svelte         |  4 +-
 .../leaderboard/LongBarZigZag.svelte          |  2 +-
 .../dashboards/pivot/PivotSidebar.svelte      |  2 +-
 .../dashboards/pivot/PivotTable.svelte        |  4 +-
 .../time-controls/SelectorButton.svelte       |  2 +-
 .../time-series/ChartInteractions.svelte      |  2 +-
 .../time-series/MeasureChart.svelte           |  6 +-
 .../dashboards/workspace/Dashboard.svelte     |  4 +-
 .../file-explorer/NavDirectoryEntry.svelte    |  2 +-
 .../src/features/file-explorer/NavFile.svelte |  2 +-
 .../onboarding/OnboardingWorkspace.svelte     |  6 +-
 .../features/visual-editing/CodeToggle.svelte |  2 +-
 .../visual-editing/SidebarWrapper.svelte      |  4 +-
 .../MetricsTable.svelte                       |  2 +-
 .../MetricsTableRow.svelte                    |  2 +-
 .../visual-metrics-editing/Sidebar.svelte     |  4 +-
 .../features/workspaces/VisualMetrics.svelte  |  2 +-
 .../src/layout/ApplicationHeader.svelte       |  2 +-
 .../src/layout/navigation/Navigation.svelte   |  4 +-
 .../navigation/NavigationMenuItem.svelte      |  4 +-
 .../navigation/NavigationMenuSeparator.svelte |  2 +-
 .../src/layout/workspace/Inspector.svelte     |  2 +-
 .../workspace/WorkspaceContainer.svelte       |  3 +-
 .../workspace/WorkspaceEditorContainer.svelte |  4 +-
 web-common/src/lib/duckdb-data-types.ts       | 16 ++---
 web-common/tailwind.config.ts                 | 26 ++------
 47 files changed, 101 insertions(+), 141 deletions(-)

diff --git a/web-admin/src/routes/+layout.svelte b/web-admin/src/routes/+layout.svelte
index c81ca7d3c2e..09661598eb7 100644
--- a/web-admin/src/routes/+layout.svelte
+++ b/web-admin/src/routes/+layout.svelte
@@ -80,7 +80,7 @@
 
 <RillTheme>
   <QueryClientProvider client={queryClient}>
-    <main class="flex flex-col min-h-screen h-screen">
+    <main class="flex flex-col min-h-screen h-screen bg-surface">
       <BannerCenter />
       {#if !hideBillingManager}
         <BillingBannerManager {organization} {organizationPermissions} />
diff --git a/web-common/src/app.css b/web-common/src/app.css
index dd302f527a2..858c576da7a 100644
--- a/web-common/src/app.css
+++ b/web-common/src/app.css
@@ -3,28 +3,15 @@
 @tailwind utilities;
 
 @layer utilities {
-  .surface-bg {
-    @apply bg-gray-100 dark:bg-gray-800;
-  }
 
-  .surface {
-    @apply bg-white dark:bg-gray-800;
-  }
 
-  .surface-secondary {
-    @apply bg-gray-100 dark:bg-gray-700;
+  .surface {
+    @apply bg-white ;
   }
 
-  .surface-impression {
-    @apply bg-gray-100 dark:bg-gray-900;
-  }
-
-  .surface-faint {
-    @apply bg-gray-50 dark:bg-transparent;
-  }
 
   .ui-copy {
-    @apply text-gray-900 dark:text-white;
+    @apply text-gray-900 ;
   }
 
   .ui-copy-dashboard-header {
@@ -33,17 +20,17 @@
   }
 
   .ui-copy-muted {
-    @apply text-gray-600 dark:text-gray-200;
+    @apply text-gray-600;
    
   }
 
   .ui-header-primary {
-    @apply text-slate-600 dark:text-slate-100;
+    @apply text-slate-600 ;
     @apply hover:text-primary-700 group-hover:text-primary-700;
   }
 
   .ui-copy-strong {
-    @apply text-gray-900 dark:text-white font-semibold;
+    @apply text-gray-900 font-semibold;
   }
 
   .ui-copy-icon {
@@ -58,12 +45,8 @@
       "kern";
   }
 
-  .ui-copy-icon-inactive {
-    @apply text-gray-500 dark:text-gray-500;
-  }
-
   .ui-copy-inactive {
-    @apply text-gray-500 dark:text-gray-400;
+    @apply text-gray-500;
   }
 
   .ui-copy-disabled {
@@ -72,7 +55,7 @@
 
   /** a non-acccessible faint version of ui-copy-disabled used in dimension tables */
   .ui-copy-disabled-faint {
-    @apply text-gray-400 dark:text-gray-400;
+    @apply text-gray-400;
   }
 
   .ui-copy-code {
@@ -81,28 +64,17 @@
     @apply text-gray-600;
   }
 
-  .ui-divider {
-    @apply border-gray-300 dark:border-gray-600;
-  }
-
-  .ui-divider-faint {
-    @apply border-gray-200 dark:border-gray-600;
-  }
-
-  .ui-divider-strong {
-    @apply border-gray-400 dark:border-gray-500;
-  }
 
   .ui-measure-bar-included {
-    @apply bg-primary-100 dark:bg-primary-700;
+    @apply bg-primary-100;
   }
 
   .ui-measure-bar-included-selected {
-    @apply bg-primary-200 dark:bg-primary-600;
+    @apply bg-primary-200;
   }
 
   .ui-measure-bar-excluded {
-    @apply bg-gray-100 dark:bg-gray-700;
+    @apply bg-gray-100;
   }
 
   .ui-editor-text-error {
@@ -113,16 +85,16 @@
     @apply bg-red-50;
   }
 
-  .ui-editor-border-error {
-    border-color: var(--ui-editor-error-foreground);
-  }
+
 }
 
 @layer base {
   :root {
     --ui-editor-error-foreground: hsl(0, 75%, 45%);
 
-    --background: 0 0% 100%;
+    --background: 210 40% 98%;
+    --surface: 0 0% 100%;
+    
     --foreground: 222.2 84% 4.9%;
   
     --muted: 210 40% 96.1%;
@@ -187,6 +159,12 @@
     /* Used to set svg gradient */
     --color-slate-200: theme("colors.slate.200");
     --color-slate-300: theme("colors.slate.300");
+
+  }
+
+  :root[data-theme="dark"] {
+    color-scheme: dark;
+    color: white;
   }
 
   h1,
@@ -207,7 +185,7 @@ button {
 }
 
 body {
-  background-color: white;
+  @apply bg-background;
   font-family: "Inter";
   font-size: 12px;
 
diff --git a/web-common/src/components/BarAndLabel.svelte b/web-common/src/components/BarAndLabel.svelte
index a9c2d738c78..ff6192515f6 100644
--- a/web-common/src/components/BarAndLabel.svelte
+++ b/web-common/src/components/BarAndLabel.svelte
@@ -30,15 +30,19 @@
     text-right grid items-center
     {justify ? `justify-${justify}` : ''} 
     {justify ? `justify-items-${justify}` : ''} relative w-full
-    {showHover ? 'hover:bg-gray-100 hover:dark:bg-gray-600' : undefined}
+    {showHover ? 'hover:bg-gray-100 ' : undefined}
     {customBackgroundColor !== ''
     ? customBackgroundColor
     : showBackground
-      ? 'bg-gray-100 dark:bg-gray-700'
+      ? 'bg-gray-100'
       : 'bg-transparent'}
     "
   style:flex="1"
 >
+  <div
+    class="number-bar {color}"
+    style="--width: {Math.min(1, $valueTween)};"
+  />
   <div
     class:pl-2={!compact}
     class:pr-2={!compact}
@@ -49,10 +53,6 @@
   >
     <slot />
   </div>
-  <div
-    class="number-bar {color} mix-blend-multiply dark:mix-blend-screen"
-    style="--width: {Math.min(1, $valueTween)};"
-  />
 </div>
 
 <style lang="postcss">
diff --git a/web-common/src/components/alert-dialog/alert-dialog-content.svelte b/web-common/src/components/alert-dialog/alert-dialog-content.svelte
index 3d7fd246941..809b5108ed6 100644
--- a/web-common/src/components/alert-dialog/alert-dialog-content.svelte
+++ b/web-common/src/components/alert-dialog/alert-dialog-content.svelte
@@ -17,7 +17,7 @@
     {transition}
     {transitionConfig}
     class={cn(
-      "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border border-slate-300 bg-background p-6 shadow-lg  sm:rounded-lg md:w-full",
+      "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border border-slate-300 bg-surface p-6 shadow-lg  sm:rounded-lg md:w-full",
       className,
     )}
     {...$$restProps}
diff --git a/web-common/src/components/alert-dialog/button-variants.ts b/web-common/src/components/alert-dialog/button-variants.ts
index 448f7594726..c4f625f9c5d 100644
--- a/web-common/src/components/alert-dialog/button-variants.ts
+++ b/web-common/src/components/alert-dialog/button-variants.ts
@@ -10,7 +10,7 @@ export const buttonVariants = tv({
       destructive:
         "bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90",
       outline:
-        "border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground",
+        "border border-input bg-surface shadow-sm hover:bg-accent hover:text-accent-foreground",
       secondary:
         "bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80",
       ghost: "hover:bg-accent hover:text-accent-foreground",
diff --git a/web-common/src/components/button/IconButton.svelte b/web-common/src/components/button/IconButton.svelte
index 0f98267f2cc..3e0fd5b91fe 100644
--- a/web-common/src/components/button/IconButton.svelte
+++ b/web-common/src/components/button/IconButton.svelte
@@ -33,7 +33,7 @@
     class:cursor-auto={disabled}
     class:rounded
     class="{marginClasses} grid place-items-center
-{active ? 'bg-gray-100 dark:bg-gray-800' : ''}
+{active ? 'bg-gray-100' : ''}
 {disabled ? 'text-gray-400' : 'text-gray-800'}
 {disableHover || disabled
       ? ''
diff --git a/web-common/src/components/button/Switch.svelte b/web-common/src/components/button/Switch.svelte
index 00589042acc..d3ba45404c9 100644
--- a/web-common/src/components/button/Switch.svelte
+++ b/web-common/src/components/button/Switch.svelte
@@ -12,8 +12,7 @@
     {checked}
     class="
       m-0
-      dark:transparent
-      checked:bg-gray-700 dark:checked:bg-gray-400
+      checked:bg-gray-700
       cursor-pointer
     "
     {id}
diff --git a/web-common/src/components/combobox/Combobox.svelte b/web-common/src/components/combobox/Combobox.svelte
index 03095b01534..725bb22fb1b 100644
--- a/web-common/src/components/combobox/Combobox.svelte
+++ b/web-common/src/components/combobox/Combobox.svelte
@@ -46,7 +46,7 @@
 
     <!-- NOTE: 52px * 4 for 208px to show scroller -->
     <Combobox.Content
-      class="w-full rounded-sm border border-muted bg-background p-[6px] shadow-md outline-none max-h-[208px] overflow-y-auto"
+      class="w-full rounded-sm border border-muted bg-surface p-[6px] shadow-md outline-none max-h-[208px] overflow-y-auto"
       sideOffset={8}
     >
       {#each filteredItems as item (item.value)}
diff --git a/web-common/src/components/data-graphic/guides/Axis.svelte b/web-common/src/components/data-graphic/guides/Axis.svelte
index be51343af77..2f9cb3f193c 100644
--- a/web-common/src/components/data-graphic/guides/Axis.svelte
+++ b/web-common/src/components/data-graphic/guides/Axis.svelte
@@ -20,7 +20,7 @@ This component will draw an axis on the specified side.
   export let fontSize: number | undefined = undefined;
   export let placement = "middle";
 
-  export let labelColor = "fill-gray-600 dark:fill-gray-400";
+  export let labelColor = "fill-gray-600";
   export let numberKind: NumberKind = NumberKind.ANY;
 
   // superlabel properties
@@ -196,7 +196,7 @@ This component will draw an axis on the specified side.
     {#if showTicks}
       <!-- tick mark -->
       <line
-        class="stroke-gray-400 dark:stroke-gray-600"
+        class="stroke-gray-400"
         x1={tickPlacement.x1}
         x2={tickPlacement.x2}
         y1={tickPlacement.y1}
diff --git a/web-common/src/components/data-graphic/guides/Grid.svelte b/web-common/src/components/data-graphic/guides/Grid.svelte
index 6090109ca3e..0479f52a82f 100644
--- a/web-common/src/components/data-graphic/guides/Grid.svelte
+++ b/web-common/src/components/data-graphic/guides/Grid.svelte
@@ -15,11 +15,11 @@
   export let showX = true;
   export let showY = true;
 
-  export let xColor = "stroke-gray-300 dark:stroke-gray-600";
+  export let xColor = "stroke-gray-300 ";
   export let xAlpha = 1;
   export let xDashArray = "1,1";
   export let xThickness = 1;
-  export let yColor = "stroke-gray-300 dark:stroke-gray-600";
+  export let yColor = "stroke-gray-300";
   export let yAlpha = 1;
   export let yDashArray = "1,1";
   export let yThickness = 1;
diff --git a/web-common/src/components/data-graphic/marks/MultiMetricMouseoverLabel.svelte b/web-common/src/components/data-graphic/marks/MultiMetricMouseoverLabel.svelte
index be83a7f4ba6..8c0faad7045 100644
--- a/web-common/src/components/data-graphic/marks/MultiMetricMouseoverLabel.svelte
+++ b/web-common/src/components/data-graphic/marks/MultiMetricMouseoverLabel.svelte
@@ -272,7 +272,7 @@ It is probably not the most up to date code; but it works very well in practice.
                 r={3}
                 paint-order="stroke"
                 fill={location.pointColor}
-                stroke="white"
+                class="stroke-surface"
                 stroke-width="3"
                 opacity={location?.yOverride
                   ? 0.7
@@ -288,7 +288,7 @@ It is probably not the most up to date code; but it works very well in practice.
   {/if}
 </g>
 
-<style>
+<style lang="postcss">
   .mc-mouseover-label {
     cursor: pointer;
     transition: fill 200ms;
@@ -296,7 +296,7 @@ It is probably not the most up to date code; but it works very well in practice.
 
   text {
     paint-order: stroke;
-    stroke: white;
+    @apply stroke-surface;
     stroke-width: 3px;
 
     /* Make all characters and numbers of equal width for easy scanibility */
diff --git a/web-common/src/components/dialog-v2/dialog-content.svelte b/web-common/src/components/dialog-v2/dialog-content.svelte
index 49e0636c027..323a812a510 100644
--- a/web-common/src/components/dialog-v2/dialog-content.svelte
+++ b/web-common/src/components/dialog-v2/dialog-content.svelte
@@ -21,7 +21,7 @@
     {transition}
     {transitionConfig}
     class={cn(
-      "fixed left-[50%] top-[50%] z-50 grid w-full max-w-xl translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg sm:rounded-lg md:w-full",
+      "fixed left-[50%] top-[50%] z-50 grid w-full max-w-xl translate-x-[-50%] translate-y-[-50%] gap-4 border bg-surface p-6 shadow-lg sm:rounded-lg md:w-full",
       className,
     )}
     {...$$restProps}
diff --git a/web-common/src/components/dialog/tabs/TabsTrigger.svelte b/web-common/src/components/dialog/tabs/TabsTrigger.svelte
index b32712ab1a2..fdd6279b8a5 100644
--- a/web-common/src/components/dialog/tabs/TabsTrigger.svelte
+++ b/web-common/src/components/dialog/tabs/TabsTrigger.svelte
@@ -14,7 +14,7 @@
 
 <TabsPrimitive.Trigger
   class={cn(
-    "flex gap-x-2 p-2 items-center justify-center whitespace-nowrap w-[200px] h-[34px] text-sm text-gray-500 font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none data-[state=active]:bg-background data-[state=active]:text-foreground",
+    "flex gap-x-2 p-2 items-center justify-center whitespace-nowrap w-[200px] h-[34px] text-sm text-gray-500 font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none data-[state=active]:bg-red-400 data-[state=active]:text-foreground",
     className,
   )}
   {value}
diff --git a/web-common/src/components/forms/Input.svelte b/web-common/src/components/forms/Input.svelte
index 99524a97175..c60630613d4 100644
--- a/web-common/src/components/forms/Input.svelte
+++ b/web-common/src/components/forms/Input.svelte
@@ -268,7 +268,7 @@
   .input-wrapper {
     @apply overflow-hidden;
     @apply flex justify-center items-center pr-0.5;
-    @apply bg-background justify-center;
+    @apply bg-surface justify-center;
     @apply border border-gray-300 rounded-[2px];
     @apply cursor-pointer;
     @apply h-fit w-fit truncate;
diff --git a/web-common/src/components/forms/Switch.svelte b/web-common/src/components/forms/Switch.svelte
index 9d278571f49..897bbaa9e58 100644
--- a/web-common/src/components/forms/Switch.svelte
+++ b/web-common/src/components/forms/Switch.svelte
@@ -29,7 +29,7 @@
 >
   <SwitchPrimitive.Thumb
     class={cn(
-      "pointer-events-none block h-4 w-4 rounded-full bg-background shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-4 data-[state=unchecked]:translate-x-0",
+      "pointer-events-none block h-4 w-4 rounded-full bg-surface shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-4 data-[state=unchecked]:translate-x-0",
       small &&
         "h-2.5 w-2.5 data-[state=checked]:translate-x-[9px] data-[state=unchecked]:-translate-x-[1px]",
       medium &&
diff --git a/web-common/src/components/select/select-trigger.svelte b/web-common/src/components/select/select-trigger.svelte
index a573fd0b1b1..6705cd12735 100644
--- a/web-common/src/components/select/select-trigger.svelte
+++ b/web-common/src/components/select/select-trigger.svelte
@@ -41,7 +41,7 @@
         on:click={() => {
           locked = false;
         }}
-        class="group active:bg-gray-50 grid bg-background place-content-center h-full absolute right-0 w-[40px] border-l pointer-events-auto cursor-pointer"
+        class="group active:bg-gray-50 grid bg-surface place-content-center h-full absolute right-0 w-[40px] border-l pointer-events-auto cursor-pointer"
       >
         <Lock size="14px" class="text-gray-600 group-hover:hidden" />
         <UnlockIcon
diff --git a/web-common/src/components/table/BasicTable.svelte b/web-common/src/components/table/BasicTable.svelte
index d6f5e294d0d..fffcd97c075 100644
--- a/web-common/src/components/table/BasicTable.svelte
+++ b/web-common/src/components/table/BasicTable.svelte
@@ -73,7 +73,7 @@
   style:--grid-template-columns={columnLayout}
 >
   {#each headers as headerGroup (headerGroup.id)}
-    <div class="row sticky top-0 z-30 bg-background">
+    <div class="row sticky top-0 z-30 bg-surface">
       {#each headerGroup.headers as header (header.id)}
         <svelte:element
           this={header.column.getCanSort() ? "button" : "div"}
diff --git a/web-common/src/components/virtualized-table/core/Cell.svelte b/web-common/src/components/virtualized-table/core/Cell.svelte
index 91a5f82d56e..e15f8d47702 100644
--- a/web-common/src/components/virtualized-table/core/Cell.svelte
+++ b/web-common/src/components/virtualized-table/core/Cell.svelte
@@ -62,9 +62,9 @@
   let activityStatus;
   $: {
     if (cellActive) {
-      activityStatus = "bg-gray-200 dark:bg-gray-600";
+      activityStatus = "bg-gray-200 ";
     } else if (rowActive && !cellActive) {
-      activityStatus = "bg-gray-100 dark:bg-gray-700";
+      activityStatus = "bg-gray-100 ";
     } else if (colSelected) {
       activityStatus = "bg-gray-50";
     } else {
diff --git a/web-common/src/features/column-profile/column-types/details/TopKListItem.svelte b/web-common/src/features/column-profile/column-types/details/TopKListItem.svelte
index 57f2858f326..d2f724e257b 100644
--- a/web-common/src/features/column-profile/column-types/details/TopKListItem.svelte
+++ b/web-common/src/features/column-profile/column-types/details/TopKListItem.svelte
@@ -4,7 +4,7 @@
   import { slide } from "svelte/transition";
 
   export let value: number; // should be between 0 and 1.
-  export let color = "bg-primary-200 dark:bg-primary-600";
+  export let color = "bg-primary-200";
 
   /** compact mode is used in e.g. profiles */
 
diff --git a/web-common/src/features/connectors/olap/TableEntry.svelte b/web-common/src/features/connectors/olap/TableEntry.svelte
index a977b4817cf..f71d6a98cb0 100644
--- a/web-common/src/features/connectors/olap/TableEntry.svelte
+++ b/web-common/src/features/connectors/olap/TableEntry.svelte
@@ -109,7 +109,7 @@
           </ContextButton>
         </DropdownMenu.Trigger>
         <DropdownMenu.Content
-          class="border-none bg-gray-800 text-white min-w-60"
+          class="min-w-60"
           align="start"
           side="right"
           sideOffset={16}
diff --git a/web-common/src/features/dashboards/granular-access-policies/ViewAsButton.svelte b/web-common/src/features/dashboards/granular-access-policies/ViewAsButton.svelte
index b96318ae6ce..d4ea9259df3 100644
--- a/web-common/src/features/dashboards/granular-access-policies/ViewAsButton.svelte
+++ b/web-common/src/features/dashboards/granular-access-policies/ViewAsButton.svelte
@@ -29,7 +29,7 @@
       <button
         use:builder.action
         {...builder}
-        class="px-3 py-1.5 rounded flex flex-row gap-x-2 hover:bg-gray-200 hover:dark:bg-gray-600 items-center"
+        class="px-3 py-1.5 rounded flex flex-row gap-x-2 hover:bg-gray-200 items-center"
       >
         <EyeIcon size={"16px"} />
         <div class="flex items-center gap-x-1">
diff --git a/web-common/src/features/dashboards/leaderboard/LeaderboardRow.svelte b/web-common/src/features/dashboards/leaderboard/LeaderboardRow.svelte
index befd111e0be..554c38190f9 100644
--- a/web-common/src/features/dashboards/leaderboard/LeaderboardRow.svelte
+++ b/web-common/src/features/dashboards/leaderboard/LeaderboardRow.svelte
@@ -312,12 +312,12 @@
   }
 
   td:first-of-type {
-    @apply p-0 bg-background;
+    @apply p-0 bg-surface;
   }
 
   a {
     @apply absolute right-0 z-50 h-[22px] w-[32px];
-    @apply bg-white flex items-center justify-center shadow-md rounded-sm;
+    @apply bg-surface flex items-center justify-center shadow-md rounded-sm;
   }
 
   a:hover {
diff --git a/web-common/src/features/dashboards/leaderboard/LongBarZigZag.svelte b/web-common/src/features/dashboards/leaderboard/LongBarZigZag.svelte
index c37fdd56173..b5b7bdb58d6 100644
--- a/web-common/src/features/dashboards/leaderboard/LongBarZigZag.svelte
+++ b/web-common/src/features/dashboards/leaderboard/LongBarZigZag.svelte
@@ -9,5 +9,5 @@
 </script>
 
 <svg class="absolute right-0 top-0 z-50" width="15" height="22">
-  <path d={zigZag} class="fill-background" />
+  <path d={zigZag} class="fill-surface" />
 </svg>
diff --git a/web-common/src/features/dashboards/pivot/PivotSidebar.svelte b/web-common/src/features/dashboards/pivot/PivotSidebar.svelte
index b644aaf12ac..ae6a0d6cbd6 100644
--- a/web-common/src/features/dashboards/pivot/PivotSidebar.svelte
+++ b/web-common/src/features/dashboards/pivot/PivotSidebar.svelte
@@ -125,7 +125,7 @@
     @apply h-full border-r z-0 w-60;
     transition-property: width;
     will-change: width;
-    @apply select-none;
+    @apply select-none bg-surface;
   }
 
   .input-wrapper {
diff --git a/web-common/src/features/dashboards/pivot/PivotTable.svelte b/web-common/src/features/dashboards/pivot/PivotTable.svelte
index 231cb8157ee..080de02bd87 100644
--- a/web-common/src/features/dashboards/pivot/PivotTable.svelte
+++ b/web-common/src/features/dashboards/pivot/PivotTable.svelte
@@ -553,7 +553,7 @@
   table {
     @apply p-0 m-0 border-spacing-0 border-separate w-fit;
     @apply font-normal;
-    @apply bg-white table-fixed;
+    @apply bg-surface table-fixed;
   }
 
   .table-wrapper {
@@ -564,7 +564,7 @@
   /* Pin header */
   thead {
     @apply sticky top-0;
-    @apply z-30 bg-white;
+    @apply z-30 bg-surface;
   }
 
   tbody .cell {
diff --git a/web-common/src/features/dashboards/time-controls/SelectorButton.svelte b/web-common/src/features/dashboards/time-controls/SelectorButton.svelte
index fd6c8dfb771..9cf447571de 100644
--- a/web-common/src/features/dashboards/time-controls/SelectorButton.svelte
+++ b/web-common/src/features/dashboards/time-controls/SelectorButton.svelte
@@ -18,7 +18,7 @@
   class:bg-gray-200={active}
   class="px-3 py-2 rounded grid gap-x-2 {!disabled
     ? 'hover:bg-gray-200'
-    : ''} {!disabled ? 'hover:dark:bg-gray-600' : ''} items-center"
+    : ''}  items-center"
   style:grid-template-columns="{$$slots['icon'] ? 'max-content' : ''}
   max-content
   {$$slots['context'] ? 'max-content' : ''}
diff --git a/web-common/src/features/dashboards/time-series/ChartInteractions.svelte b/web-common/src/features/dashboards/time-series/ChartInteractions.svelte
index 9f81629f928..dcc3d06f856 100644
--- a/web-common/src/features/dashboards/time-series/ChartInteractions.svelte
+++ b/web-common/src/features/dashboards/time-series/ChartInteractions.svelte
@@ -196,7 +196,7 @@
 
 <style lang="postcss">
   button {
-    @apply border rounded-[2px] bg-background pointer-events-auto;
+    @apply border rounded-[2px] bg-surface pointer-events-auto;
     @apply absolute left-1/2 -top-8 -translate-x-1/2 z-50;
   }
 
diff --git a/web-common/src/features/dashboards/time-series/MeasureChart.svelte b/web-common/src/features/dashboards/time-series/MeasureChart.svelte
index d7792e6c8e3..3a648d7a8dc 100644
--- a/web-common/src/features/dashboards/time-series/MeasureChart.svelte
+++ b/web-common/src/features/dashboards/time-series/MeasureChart.svelte
@@ -310,9 +310,8 @@
           {#if point && inBounds(internalXMin, internalXMax, point[xAccessor])}
             <g transition:fly={{ duration: 100, x: -4 }}>
               <text
-                class="fill-gray-600"
+                class="fill-gray-600 stroke-surface"
                 style:paint-order="stroke"
-                stroke="white"
                 stroke-width="3px"
                 x={config.plotLeft + config.bodyBuffer + 6}
                 y={config.plotTop + 10 + config.bodyBuffer}
@@ -322,9 +321,8 @@
               {#if showComparison && point[`comparison.${labelAccessor}`]}
                 <text
                   style:paint-order="stroke"
-                  stroke="white"
                   stroke-width="3px"
-                  class="fill-gray-400"
+                  class="fill-gray-400 stroke-surface"
                   x={config.plotLeft + config.bodyBuffer + 6}
                   y={config.plotTop + 24 + config.bodyBuffer}
                 >
diff --git a/web-common/src/features/dashboards/workspace/Dashboard.svelte b/web-common/src/features/dashboards/workspace/Dashboard.svelte
index d5111b26691..7147540c718 100644
--- a/web-common/src/features/dashboards/workspace/Dashboard.svelte
+++ b/web-common/src/features/dashboards/workspace/Dashboard.svelte
@@ -100,7 +100,7 @@
 >
   <div
     id="header"
-    class="border-b w-fit min-w-full flex flex-col bg-slate-50 slide"
+    class="border-b w-fit min-w-full flex flex-col bg-background slide"
     class:left-shift={extraLeftPadding}
   >
     {#if mockUserHasNoAccess}
@@ -128,7 +128,7 @@
     <PivotDisplay />
   {:else}
     <div
-      class="flex gap-x-1 gap-y-2 size-full overflow-hidden pl-4 slide"
+      class="flex gap-x-1 gap-y-2 size-full overflow-hidden pl-4 slide bg-surface"
       class:flex-col={expandedMeasureName}
       class:flex-row={!expandedMeasureName}
       class:left-shift={extraLeftPadding}
diff --git a/web-common/src/features/file-explorer/NavDirectoryEntry.svelte b/web-common/src/features/file-explorer/NavDirectoryEntry.svelte
index 2f0ad7e12ff..95131be140f 100644
--- a/web-common/src/features/file-explorer/NavDirectoryEntry.svelte
+++ b/web-common/src/features/file-explorer/NavDirectoryEntry.svelte
@@ -112,7 +112,7 @@
       </DropdownMenu.Trigger>
       <DropdownMenu.Content
         align="start"
-        class="border-none bg-gray-800 text-white min-w-60"
+        class="min-w-60"
         side="right"
         sideOffset={16}
       >
diff --git a/web-common/src/features/file-explorer/NavFile.svelte b/web-common/src/features/file-explorer/NavFile.svelte
index c5d3e37dc80..529b6a1cd7d 100644
--- a/web-common/src/features/file-explorer/NavFile.svelte
+++ b/web-common/src/features/file-explorer/NavFile.svelte
@@ -148,7 +148,7 @@
       </DropdownMenu.Trigger>
       <DropdownMenu.Content
         align="start"
-        class="border-none bg-gray-800 text-white min-w-60"
+        class="min-w-60"
         side="right"
         sideOffset={16}
       >
diff --git a/web-common/src/features/onboarding/OnboardingWorkspace.svelte b/web-common/src/features/onboarding/OnboardingWorkspace.svelte
index 36c46e5b167..3f9b8f6c570 100644
--- a/web-common/src/features/onboarding/OnboardingWorkspace.svelte
+++ b/web-common/src/features/onboarding/OnboardingWorkspace.svelte
@@ -74,15 +74,13 @@
   ];
 </script>
 
-<div
-  class="pt-20 px-8 flex flex-col gap-y-6 items-center bg-gray-100 size-full"
->
+<div class="pt-20 px-8 flex flex-col gap-y-6 items-center size-full">
   <div class="text-center">
     <div class="font-bold">Getting started</div>
     <p>Building data intuition at every step of analysis</p>
   </div>
   <ol
-    class="max-w-fit flex flex-col gap-y-4 px-9 pt-9 pb-[60px] bg-gray-50 rounded-lg border border-gray-200"
+    class="max-w-fit flex flex-col gap-y-4 px-9 pt-9 pb-[60px] bg-surface rounded-lg border border-gray-200"
   >
     {#if olapConnector}
       {#each steps as step, i (step.heading)}
diff --git a/web-common/src/features/visual-editing/CodeToggle.svelte b/web-common/src/features/visual-editing/CodeToggle.svelte
index f6ae735e157..6589b6b768c 100644
--- a/web-common/src/features/visual-editing/CodeToggle.svelte
+++ b/web-common/src/features/visual-editing/CodeToggle.svelte
@@ -59,7 +59,7 @@
   }
 
   .toggle {
-    @apply bg-white outline outline-slate-200 outline-[1px];
+    @apply bg-surface outline outline-slate-200 outline-[1px];
   }
 
   .radio {
diff --git a/web-common/src/features/visual-editing/SidebarWrapper.svelte b/web-common/src/features/visual-editing/SidebarWrapper.svelte
index 4d46430f04e..b4eb004e9dd 100644
--- a/web-common/src/features/visual-editing/SidebarWrapper.svelte
+++ b/web-common/src/features/visual-editing/SidebarWrapper.svelte
@@ -5,7 +5,7 @@
 </script>
 
 <div
-  class="size-full bg-background flex-none flex flex-col select-none rounded-[2px] w-full"
+  class="size-full bg-surface flex-none flex flex-col select-none rounded-[2px] w-full"
 >
   <div class={type}>
     <h1 class:pb-2={type == "secondary" && !$$slots.header}>{title}</h1>
@@ -13,7 +13,7 @@
   </div>
 
   <div
-    class="flex flex-col w-full h-full overflow-y-auto overflow-x-visible"
+    class="flex flex-col w-full h-full overflow-y-auto overflow-x-visible pb-8"
     class:px-5={!disableHorizontalPadding}
     class:gap-y-1={type === "secondary"}
     class:gap-y-3={type === "primary"}
diff --git a/web-common/src/features/visual-metrics-editing/MetricsTable.svelte b/web-common/src/features/visual-metrics-editing/MetricsTable.svelte
index 0260beb7599..75f3a3d3bd4 100644
--- a/web-common/src/features/visual-metrics-editing/MetricsTable.svelte
+++ b/web-common/src/features/visual-metrics-editing/MetricsTable.svelte
@@ -259,7 +259,7 @@
 
   th {
     @apply text-left;
-    @apply pl-4 text-slate-500 bg-background;
+    @apply pl-4 text-slate-500 bg-surface;
     @apply border-b text-sm font-semibold;
     @apply truncate;
   }
diff --git a/web-common/src/features/visual-metrics-editing/MetricsTableRow.svelte b/web-common/src/features/visual-metrics-editing/MetricsTableRow.svelte
index 4c50a8048cd..b6cd777133d 100644
--- a/web-common/src/features/visual-metrics-editing/MetricsTableRow.svelte
+++ b/web-common/src/features/visual-metrics-editing/MetricsTableRow.svelte
@@ -172,7 +172,7 @@
   }
 
   tr {
-    @apply bg-background;
+    @apply bg-surface;
   }
 
   .dragging {
diff --git a/web-common/src/features/visual-metrics-editing/Sidebar.svelte b/web-common/src/features/visual-metrics-editing/Sidebar.svelte
index 2d074c034d8..c05e1cc6cbd 100644
--- a/web-common/src/features/visual-metrics-editing/Sidebar.svelte
+++ b/web-common/src/features/visual-metrics-editing/Sidebar.svelte
@@ -259,7 +259,7 @@
 />
 
 <div
-  class="h-full w-[320px] bg-background flex-none flex flex-col border select-none rounded-[2px]"
+  class="h-full w-[320px] bg-surface flex-none flex flex-col border select-none rounded-[2px]"
 >
   <h1 class="pt-6 px-5">{editing ? "Edit" : "Add"} {type.slice(0, -1)}</h1>
 
@@ -270,7 +270,7 @@
       {@const { hint, key, options, placeholder, boolean } = fields[selected]}
 
       {#if boolean}
-        <div class="flex gap-x-2 items-center h-full bg-white rounded-full">
+        <div class="flex gap-x-2 items-center h-full rounded-full">
           <Switch bind:checked={editingClone[key]} id="auto-save" medium />
           <Label class="font-medium text-sm" for="auto-save">{label}</Label>
           {#if hint}
diff --git a/web-common/src/features/workspaces/VisualMetrics.svelte b/web-common/src/features/workspaces/VisualMetrics.svelte
index 6d35673899a..ed4d777b60e 100644
--- a/web-common/src/features/workspaces/VisualMetrics.svelte
+++ b/web-common/src/features/workspaces/VisualMetrics.svelte
@@ -876,7 +876,7 @@
   }
 
   .main-area {
-    @apply flex flex-col gap-y-4 size-full p-4 bg-background border;
+    @apply flex flex-col gap-y-4 size-full p-4 bg-surface border;
     @apply flex-shrink overflow-hidden rounded-[2px] relative;
   }
 
diff --git a/web-common/src/layout/ApplicationHeader.svelte b/web-common/src/layout/ApplicationHeader.svelte
index 9fabaaf7d4b..4d3630f64fe 100644
--- a/web-common/src/layout/ApplicationHeader.svelte
+++ b/web-common/src/layout/ApplicationHeader.svelte
@@ -122,7 +122,7 @@
 
 <style lang="postcss">
   header {
-    @apply w-full bg-background box-border;
+    @apply w-full bg-surface box-border;
     @apply flex gap-x-2 items-center px-4 border-b flex-none;
     @apply h-11;
   }
diff --git a/web-common/src/layout/navigation/Navigation.svelte b/web-common/src/layout/navigation/Navigation.svelte
index 0240df6417c..195208e8004 100644
--- a/web-common/src/layout/navigation/Navigation.svelte
+++ b/web-common/src/layout/navigation/Navigation.svelte
@@ -173,7 +173,7 @@
 
 <style lang="postcss">
   .sidebar {
-    @apply flex flex-col flex-none relative overflow-hidden;
+    @apply flex flex-col flex-none relative overflow-hidden bg-surface;
     @apply h-full border-r z-0;
     @apply select-none;
     transition-property: width;
@@ -191,7 +191,7 @@
 
   .scroll-container {
     @apply overflow-y-auto overflow-x-hidden;
-    @apply transition-colors h-full bg-white;
+    @apply h-full bg-surface;
   }
 
   .sidebar:not(.resizing) {
diff --git a/web-common/src/layout/navigation/NavigationMenuItem.svelte b/web-common/src/layout/navigation/NavigationMenuItem.svelte
index 7327ba01eba..8ea49056bba 100644
--- a/web-common/src/layout/navigation/NavigationMenuItem.svelte
+++ b/web-common/src/layout/navigation/NavigationMenuItem.svelte
@@ -8,14 +8,14 @@
 {#key disabled}
   <DropdownMenu.Item
     {href}
-    class="data-[highlighted]:bg-gray-600 dark gap-2"
+    class="gap-2"
     aria-disabled={disabled}
     {disabled}
     on:click
   >
     {#if $$slots.icon}
       <div
-        class="grid place-content-center opacity-80 ui-copy-icon dark:text-white"
+        class="grid place-content-center opacity-80 ui-copy-icon"
         style:height="18px"
       >
         <slot name="icon" />
diff --git a/web-common/src/layout/navigation/NavigationMenuSeparator.svelte b/web-common/src/layout/navigation/NavigationMenuSeparator.svelte
index 468f2193227..2e4eeddc9c7 100644
--- a/web-common/src/layout/navigation/NavigationMenuSeparator.svelte
+++ b/web-common/src/layout/navigation/NavigationMenuSeparator.svelte
@@ -2,4 +2,4 @@
   import * as DropdownMenu from "@rilldata/web-common/components/dropdown-menu/";
 </script>
 
-<DropdownMenu.Separator class="bg-gray-500" />
+<DropdownMenu.Separator />
diff --git a/web-common/src/layout/workspace/Inspector.svelte b/web-common/src/layout/workspace/Inspector.svelte
index 9e7350c0895..e23b404a3c3 100644
--- a/web-common/src/layout/workspace/Inspector.svelte
+++ b/web-common/src/layout/workspace/Inspector.svelte
@@ -53,7 +53,7 @@
   .inner {
     will-change: width;
     @apply h-full flex-none;
-    @apply border border-gray-200 bg-white;
+    @apply border border-gray-200 bg-surface;
     @apply overflow-y-auto overflow-x-hidden rounded-[2px];
   }
 </style>
diff --git a/web-common/src/layout/workspace/WorkspaceContainer.svelte b/web-common/src/layout/workspace/WorkspaceContainer.svelte
index 6dae1d2c0eb..937bf3580fa 100644
--- a/web-common/src/layout/workspace/WorkspaceContainer.svelte
+++ b/web-common/src/layout/workspace/WorkspaceContainer.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
   export let inspector = true;
-  export let bgClass = "bg-slate-50";
   export let width = 0;
   export let height = 0;
 
@@ -10,7 +9,7 @@
 </script>
 
 <main
-  class="flex flex-col size-full overflow-hidden {bgClass}"
+  class="flex flex-col size-full overflow-hidden bg-background"
   bind:contentRect
 >
   {#if $$slots.header}
diff --git a/web-common/src/layout/workspace/WorkspaceEditorContainer.svelte b/web-common/src/layout/workspace/WorkspaceEditorContainer.svelte
index 24d30a771bb..d181f429a69 100644
--- a/web-common/src/layout/workspace/WorkspaceEditorContainer.svelte
+++ b/web-common/src/layout/workspace/WorkspaceEditorContainer.svelte
@@ -8,9 +8,9 @@
   export let showError = true;
 </script>
 
-<div class="flex flex-col size-full gap-y-1 overflow-y-auto">
+<div class="flex flex-col size-full gap-y-1 overflow-y-auto bg-surface">
   <div
-    class="size-full border overflow-y-hidden rounded-[2px] bg-background flex flex-col items-center justify-center"
+    class="size-full border overflow-y-hidden rounded-[2px] flex flex-col items-center justify-center"
     class:!border-red-500={error}
   >
     <slot />
diff --git a/web-common/src/lib/duckdb-data-types.ts b/web-common/src/lib/duckdb-data-types.ts
index 40ba0009d6d..1eac0ebd6c5 100644
--- a/web-common/src/lib/duckdb-data-types.ts
+++ b/web-common/src/lib/duckdb-data-types.ts
@@ -136,10 +136,10 @@ interface ColorTokens {
 }
 
 export const CATEGORICAL_TOKENS: ColorTokens = {
-  textClass: "text-sky-800 dark:text-sky-200",
-  bgClass: "bg-sky-200 dark:bg-sky-600",
-  vizFillClass: "fill-sky-800 dark:fill-sky-200",
-  vizStrokeClass: "stroke-sky-800 dark:stroke-sky-200",
+  textClass: "text-sky-800",
+  bgClass: "bg-sky-200",
+  vizFillClass: "fill-sky-800 ",
+  vizStrokeClass: "stroke-sky-800",
 };
 
 export const NUMERIC_TOKENS: ColorTokens = {
@@ -157,10 +157,10 @@ export const TIMESTAMP_TOKENS: ColorTokens = {
 };
 
 export const NESTED_TOKENS: ColorTokens = {
-  textClass: "text-gray-800 dark:text-gray-200",
-  bgClass: "bg-gray-200 dark:bg-gray-600",
-  vizFillClass: "fill-gray-800 dark:fill-gray-200",
-  vizStrokeClass: "stroke-gray-800 dark:stroke-gray-200",
+  textClass: "text-gray-800",
+  bgClass: "bg-gray-200",
+  vizFillClass: "fill-gray-800",
+  vizStrokeClass: "stroke-gray-800",
 };
 
 export const INTERVAL_TOKENS: ColorTokens = TIMESTAMP_TOKENS;
diff --git a/web-common/tailwind.config.ts b/web-common/tailwind.config.ts
index 3af55607c8b..dbe01bc4289 100644
--- a/web-common/tailwind.config.ts
+++ b/web-common/tailwind.config.ts
@@ -1,28 +1,16 @@
 import type { Config } from "tailwindcss";
 import {
   type LightnessMap,
+  TailwindColorSpacing,
   type ThemeColorKind,
   defaultPrimaryColors,
   defaultSecondaryColors,
   mutedColors,
 } from "./src/features/themes/color-config";
 
-/**
- * Takes a LightnessMap map object and a ThemeColorKind
- * ("primary" | "secondary" | "muted"),
- * and returns an object of the form e.g:
- * {
- *   "primary-50": "var(--color-primary-50)",
- *   "primary-100": "var(--color-primary-100)",
- * ...
- * }
- */
-function addThemeColorsAsVarRefs(
-  colorMap: LightnessMap,
-  themeColorKind: ThemeColorKind,
-) {
+function addThemeColorsAsVarRefs(themeColorKind: string) {
   return Object.fromEntries(
-    Object.keys(colorMap).map((colorNum) => {
+    TailwindColorSpacing.map((colorNum) => {
       return [
         `${colorNum}`,
         `hsl(var(--hsl-${themeColorKind}-${colorNum}) / <alpha-value>)`,
@@ -77,13 +65,13 @@ export default {
         primary: {
           DEFAULT: "hsl(var(--primary) / <alpha-value>)",
           foreground: "hsl(var(--primary-foreground) / <alpha-value>)",
-          ...addThemeColorsAsVarRefs(defaultPrimaryColors, "primary"),
+          ...addThemeColorsAsVarRefs("primary"),
         },
-
+        surface: "hsl(var(--surface) / <alpha-value>)",
         secondary: {
           DEFAULT: "hsl(var(--secondary) / <alpha-value>)",
           foreground: "hsl(var(--secondary-foreground) / <alpha-value>)",
-          ...addThemeColorsAsVarRefs(defaultSecondaryColors, "secondary"),
+          ...addThemeColorsAsVarRefs("secondary"),
         },
         destructive: {
           DEFAULT: "hsl(var(--destructive) / <alpha-value>)",
@@ -92,7 +80,7 @@ export default {
         muted: {
           DEFAULT: "hsl(var(--muted) / <alpha-value>)",
           foreground: "hsl(var(--muted-foreground) / <alpha-value>)",
-          ...addThemeColorsAsVarRefs(mutedColors, "muted"),
+          ...addThemeColorsAsVarRefs("muted"),
         },
         accent: {
           DEFAULT: "hsl(var(--accent) / <alpha-value>)",

From 8a22a74117a19686970b7bc4161e1fb84d1e89c4 Mon Sep 17 00:00:00 2001
From: Anshul Khandelwal <12948312+k-anshul@users.noreply.github.com>
Date: Mon, 3 Feb 2025 13:45:01 +0100
Subject: [PATCH 39/48] fix: do not log cancellation errors in worker jobs
 (#6540)

* do not log cancellation errors in worked jobs

* some more log changes
---
 admin/worker/worker.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/worker/worker.go b/admin/worker/worker.go
index 2c7a836f96a..330bf196617 100644
--- a/admin/worker/worker.go
+++ b/admin/worker/worker.go
@@ -2,6 +2,7 @@ package worker
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/http"
 	"time"
@@ -107,7 +108,7 @@ func (w *Worker) RunJob(ctx context.Context, name string) error {
 func (w *Worker) schedule(ctx context.Context, name string, fn func(context.Context) error, every time.Duration) error {
 	for {
 		err := w.runJob(ctx, name, fn)
-		if err != nil {
+		if err != nil && !errors.Is(err, context.Canceled) {
 			w.logger.Error("Failed to run the job", zap.String("job_name", name), zap.Error(err))
 		}
 		select {
@@ -133,7 +134,7 @@ func (w *Worker) scheduleCron(ctx context.Context, name string, fn func(context.
 			return nil
 		case <-time.After(waitDuration):
 			err := w.runJob(ctx, name, fn)
-			if err != nil {
+			if err != nil && !errors.Is(err, context.Canceled) {
 				w.logger.Error("Failed to run the cronjob", zap.String("cronjob_name", name), zap.Error(err))
 			}
 		}
@@ -152,7 +153,6 @@ func (w *Worker) runJob(ctx context.Context, name string, fn func(context.Contex
 	err := fn(ctx)
 	jobLatencyHistogram.Record(ctx, time.Since(start).Milliseconds(), metric.WithAttributes(attribute.String("name", name), attribute.Bool("failed", err != nil)))
 	if err != nil {
-		w.logger.Error("job failed", zap.String("name", name), zap.Error(err), zap.Duration("duration", time.Since(start)), observability.ZapCtx(ctx))
 		return err
 	}
 	w.logger.Info("job completed", zap.String("name", name), zap.Duration("duration", time.Since(start)), observability.ZapCtx(ctx))

From d61e3f8422a8c1d5e4635a39a7e8f7f05942d9b7 Mon Sep 17 00:00:00 2001
From: Aditya Hegde <adityahegderocks@gmail.com>
Date: Mon, 3 Feb 2025 18:56:34 +0530
Subject: [PATCH 40/48] feat: file upload input (#6487)

* Basic FileInput

* Add error state

* Add drag-drop support

* Add drop-over state and loading state

* Fix lint

* Add preview
---
 .../src/components/forms/FileInput.svelte     | 172 ++++++++++++++++++
 .../src/components/icons/Attachment.svelte    |  19 ++
 2 files changed, 191 insertions(+)
 create mode 100644 web-common/src/components/forms/FileInput.svelte
 create mode 100644 web-common/src/components/icons/Attachment.svelte

diff --git a/web-common/src/components/forms/FileInput.svelte b/web-common/src/components/forms/FileInput.svelte
new file mode 100644
index 00000000000..b97bab9751d
--- /dev/null
+++ b/web-common/src/components/forms/FileInput.svelte
@@ -0,0 +1,172 @@
+<script lang="ts">
+  import LoadingSpinner from "@rilldata/web-common/components/icons/LoadingSpinner.svelte";
+  import Viz from "@rilldata/web-common/components/icons/Viz.svelte";
+
+  export let value: string | string[] | undefined = undefined;
+  export let error: string | Record<string | number, string[]> | undefined =
+    undefined;
+  export let multiple: boolean = false;
+  export let accept: string | undefined = undefined;
+  // Currently we upload either to runtime or cloud.
+  // Implementation of it will be upto the caller of this component.
+  export let uploadFile: (file: File) => Promise<string>;
+
+  $: values = value ? (multiple ? (value as string[]) : [value as string]) : [];
+  $: errors = error ? (multiple ? error : { 0: error }) : [];
+
+  $: uploading = {};
+  $: uploadErrors = {};
+  let fileInput: HTMLInputElement;
+
+  // maintain a list of filenames to show in error messages.
+  // since the final uploaded url set in `value` is usually not the same this is needed.
+  let fileNames: string[] = value
+    ? multiple
+      ? (value as string[])
+      : [value as string]
+    : [];
+  $: hasValue = values.length > 0 || Object.values(uploading).some((u) => u);
+
+  function uploadFiles(files: FileList) {
+    uploading = {};
+    uploadErrors = {};
+    if (multiple) {
+      value = new Array(files.length).fill("");
+      fileNames = new Array<string>(files.length).fill("");
+    } else {
+      value = "";
+      fileNames = [""];
+    }
+    for (let i = 0; i < files.length; i++) {
+      void uploadFileWrapper(files[i], i);
+    }
+  }
+
+  async function uploadFileWrapper(file: File, i: number) {
+    uploading[i] = true;
+    try {
+      fileNames[i] = file.name;
+      const url = await uploadFile(file);
+      if (multiple) {
+        if (value === undefined) {
+          value = [];
+        }
+        (value as string[])[i] = url;
+      } else {
+        value = url;
+      }
+    } catch (err) {
+      uploadErrors[i] = err.message;
+    }
+    uploading[i] = false;
+  }
+
+  function handleInput() {
+    if (!fileInput.files) return;
+    uploadFiles(fileInput.files);
+  }
+
+  function handleFileDrop(event: DragEvent) {
+    dragOver = false;
+
+    if (!event.dataTransfer?.files?.length) return;
+    uploadFiles(event.dataTransfer.files);
+  }
+
+  let dragOver = false;
+  $: errorMessages = Object.values({
+    ...(errors as Record<string, any>),
+    ...uploadErrors,
+  })
+    .map((e, i) => (fileNames[i] && e ? `${fileNames[i]}:${e}` : ""))
+    .filter(Boolean);
+</script>
+
+<div class="container grid">
+  <button
+    class="upload-button"
+    on:click={() => fileInput.click()}
+    on:dragenter|preventDefault|stopPropagation={() => (dragOver = true)}
+    on:dragleave|preventDefault|stopPropagation={() => (dragOver = false)}
+    on:dragover|preventDefault|stopPropagation
+    on:drop|preventDefault={handleFileDrop}
+    class:bg-neutral-100={!dragOver}
+    class:bg-primary-100={dragOver}
+  >
+    {#if hasValue}
+      <div class="upload-preview">
+        {#each fileNames as _, i (i)}
+          {@const isUploading = !!uploading[i]}
+          {@const hasError =
+            (!!uploadErrors[i] || !!errors?.[i]) && !isUploading}
+          {@const val = values[i]}
+          {#if (val || isUploading) && !hasError}
+            <div class="border border-neutral-400 p-1">
+              {#if isUploading}
+                <LoadingSpinner size="36px" />
+              {:else}
+                <img src={val} alt="upload" class="h-10 w-fit" />
+              {/if}
+            </div>
+          {/if}
+        {/each}
+      </div>
+    {:else}
+      <Viz size="28px" class="text-gray-400 pointer-events-none" />
+      <div class="container-flex-col pointer-events-none">
+        <span class="upload-title"> Upload an image </span>
+        {#if multiple}
+          <span class="upload-description">
+            Support for a single or bulk upload.
+          </span>
+        {/if}
+      </div>
+    {/if}
+  </button>
+  {#if errorMessages.length > 0}
+    <div class="error">
+      {#each errorMessages as errorMessage, i (i)}
+        <div>{errorMessage}</div>
+      {/each}
+    </div>
+  {/if}
+  <input
+    type="file"
+    {accept}
+    hidden
+    {multiple}
+    bind:this={fileInput}
+    on:input={handleInput}
+  />
+</div>
+
+<style lang="postcss">
+  .container {
+    @apply flex flex-col gap-y-2;
+  }
+
+  .container-flex-col {
+    @apply flex flex-col;
+  }
+
+  .upload-button {
+    @apply flex flex-row gap-x-2.5 items-center justify-center py-5 min-h-10 w-80;
+    @apply border border-neutral-400;
+  }
+
+  .upload-title {
+    @apply text-sm font-medium text-left text-gray-500;
+  }
+
+  .upload-description {
+    @apply text-xs font-normal text-gray-400;
+  }
+
+  .upload-preview {
+    @apply flex flex-wrap w-full gap-x-1 items-center justify-center pointer-events-none px-4;
+  }
+
+  .error {
+    @apply text-red-600 text-xs py-px mt-0.5;
+  }
+</style>
diff --git a/web-common/src/components/icons/Attachment.svelte b/web-common/src/components/icons/Attachment.svelte
new file mode 100644
index 00000000000..e9481bff9e1
--- /dev/null
+++ b/web-common/src/components/icons/Attachment.svelte
@@ -0,0 +1,19 @@
+<script>
+  export let size = "1em";
+  export let color = "currentColor";
+  export let className = "";
+</script>
+
+<svg
+  height={size}
+  viewBox="0 0 14 14"
+  fill={color}
+  xmlns="http://www.w3.org/2000/svg"
+  class={className}
+>
+  <path
+    d="M11.1766 2.07461C9.7047 0.602734 7.30783 0.602734 5.83751 2.07461L1.75939 6.14961C1.73283 6.17617 1.71876 6.21211 1.71876 6.24961C1.71876 6.28711 1.73283 6.32305 1.75939 6.34961L2.33595 6.92617C2.36231 6.95241 2.39798 6.96714 2.43517 6.96714C2.47236 6.96714 2.50804 6.95241 2.53439 6.92617L6.61251 2.85117C7.11877 2.34492 7.7922 2.0668 8.50783 2.0668C9.22345 2.0668 9.89689 2.34492 10.4016 2.85117C10.9078 3.35742 11.186 4.03086 11.186 4.74492C11.186 5.46055 10.9078 6.13242 10.4016 6.63867L6.24533 10.7934L5.57189 11.4668C4.9422 12.0965 3.91876 12.0965 3.28908 11.4668C2.98439 11.1621 2.8172 10.7574 2.8172 10.3262C2.8172 9.89492 2.98439 9.49024 3.28908 9.18555L7.41252 5.06367C7.5172 4.96055 7.6547 4.90273 7.80158 4.90273H7.80314C7.95002 4.90273 8.08595 4.96055 8.18908 5.06367C8.29376 5.16836 8.35002 5.30586 8.35002 5.45273C8.35002 5.59805 8.2922 5.73555 8.18908 5.83867L4.81876 9.20586C4.7922 9.23242 4.77814 9.26836 4.77814 9.30586C4.77814 9.34336 4.7922 9.3793 4.81876 9.40586L5.39533 9.98242C5.42168 10.0087 5.45736 10.0234 5.49455 10.0234C5.53174 10.0234 5.56741 10.0087 5.59377 9.98242L8.96251 6.61367C9.27345 6.30273 9.44377 5.89023 9.44377 5.45117C9.44377 5.01211 9.27189 4.59805 8.96251 4.28867C8.32033 3.64648 7.27658 3.64805 6.63439 4.28867L6.23439 4.69023L2.51251 8.41055C2.25991 8.66167 2.05967 8.96045 1.92341 9.28956C1.78716 9.61866 1.7176 9.97154 1.71876 10.3277C1.71876 11.0512 2.00158 11.7309 2.51251 12.2418C3.0422 12.7699 3.73595 13.034 4.4297 13.034C5.12345 13.034 5.8172 12.7699 6.34533 12.2418L11.1766 7.41367C11.8875 6.70117 12.2813 5.75273 12.2813 4.74492C12.2828 3.73555 11.8891 2.78711 11.1766 2.07461Z"
+    fill="black"
+    fill-opacity="0.45"
+  />
+</svg>

From 3e048edb887f5a7292db29171a8a6dc266c29c42 Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Mon, 3 Feb 2025 08:44:22 -0500
Subject: [PATCH 41/48] List measures & dimensions by the order specified in
 the Explore (#6555)

---
 .../state-managers/selectors/dimensions.ts    | 27 +++++++---
 .../state-managers/selectors/measures.ts      | 49 ++++++++++++++-----
 2 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/web-common/src/features/dashboards/state-managers/selectors/dimensions.ts b/web-common/src/features/dashboards/state-managers/selectors/dimensions.ts
index 8370709e4ff..8abe4391282 100644
--- a/web-common/src/features/dashboards/state-managers/selectors/dimensions.ts
+++ b/web-common/src/features/dashboards/state-managers/selectors/dimensions.ts
@@ -8,21 +8,36 @@ export const allDimensions = ({
   DashboardDataSources,
   "validMetricsView" | "validExplore"
 >): MetricsViewSpecDimensionV2[] => {
+  if (!validMetricsView?.dimensions || !validExplore?.dimensions) return [];
+
   return (
-    validMetricsView?.dimensions?.filter((d) =>
-      validExplore?.dimensions?.includes(d.name ?? ""),
-    ) ?? []
+    validMetricsView.dimensions
+      .filter((d) => validExplore.dimensions!.includes(d.name!))
+      // Sort the filtered dimensions based on their order in validExplore.dimensions
+      .sort(
+        (a, b) =>
+          validExplore.dimensions!.indexOf(a.name!) -
+          validExplore.dimensions!.indexOf(b.name!),
+      )
   );
 };
 
 export const visibleDimensions = ({
   validMetricsView,
+  validExplore,
   dashboard,
 }: DashboardDataSources): MetricsViewSpecDimensionV2[] => {
+  if (!validMetricsView?.dimensions || !validExplore?.dimensions) return [];
+
   return (
-    validMetricsView?.dimensions?.filter(
-      (d) => d.name && dashboard.visibleDimensionKeys.has(d.name),
-    ) ?? []
+    validMetricsView.dimensions
+      .filter((d) => dashboard.visibleDimensionKeys.has(d.name!))
+      // Sort the filtered dimensions based on their order in validExplore.dimensions
+      .sort(
+        (a, b) =>
+          validExplore.dimensions!.indexOf(a.name!) -
+          validExplore.dimensions!.indexOf(b.name!),
+      )
   );
 };
 
diff --git a/web-common/src/features/dashboards/state-managers/selectors/measures.ts b/web-common/src/features/dashboards/state-managers/selectors/measures.ts
index e59427b41f9..1b9aa9dc203 100644
--- a/web-common/src/features/dashboards/state-managers/selectors/measures.ts
+++ b/web-common/src/features/dashboards/state-managers/selectors/measures.ts
@@ -14,10 +14,17 @@ export const allMeasures = ({
   DashboardDataSources,
   "validMetricsView" | "validExplore"
 >): MetricsViewSpecMeasureV2[] => {
+  if (!validMetricsView?.measures || !validExplore?.measures) return [];
+
   return (
-    validMetricsView?.measures?.filter((m) =>
-      validExplore?.measures?.includes(m.name ?? ""),
-    ) ?? []
+    validMetricsView.measures
+      .filter((m) => validExplore.measures!.includes(m.name!))
+      // Sort the filtered measures based on their order in validExplore.measures
+      .sort(
+        (a, b) =>
+          validExplore.measures!.indexOf(a.name!) -
+          validExplore.measures!.indexOf(b.name!),
+      )
   );
 };
 
@@ -27,12 +34,20 @@ export const leaderboardMeasureName = ({ dashboard }: DashboardDataSources) => {
 
 export const visibleMeasures = ({
   validMetricsView,
+  validExplore,
   dashboard,
 }: DashboardDataSources): MetricsViewSpecMeasureV2[] => {
+  if (!validMetricsView?.measures || !validExplore?.measures) return [];
+
   return (
-    validMetricsView?.measures?.filter(
-      (m) => m.name && dashboard.visibleMeasureKeys.has(m.name),
-    ) ?? []
+    validMetricsView.measures
+      .filter((m) => dashboard.visibleMeasureKeys.has(m.name!))
+      // Sort the filtered measures based on their order in validExplore.measures
+      .sort(
+        (a, b) =>
+          validExplore.measures!.indexOf(a.name!) -
+          validExplore.measures!.indexOf(b.name!),
+      )
   );
 };
 
@@ -54,6 +69,7 @@ export const measureLabel = ({
     return measure?.displayName || measureName;
   };
 };
+
 export const isMeasureValidPercentOfTotal = ({
   validMetricsView,
 }: DashboardDataSources): ((measureName: string) => boolean) => {
@@ -70,13 +86,22 @@ export const filteredSimpleMeasures = ({
   validExplore,
 }: DashboardDataSources) => {
   return () => {
+    if (!validMetricsView?.measures || !validExplore?.measures) return [];
+
     return (
-      validMetricsView?.measures?.filter(
-        (m) =>
-          !m.window &&
-          m.type !== MetricsViewSpecMeasureType.MEASURE_TYPE_TIME_COMPARISON &&
-          validExplore?.measures?.includes(m.name ?? ""),
-      ) ?? []
+      validMetricsView.measures
+        .filter(
+          (m) =>
+            validExplore.measures!.includes(m.name!) &&
+            !m.window &&
+            m.type !== MetricsViewSpecMeasureType.MEASURE_TYPE_TIME_COMPARISON,
+        )
+        // Sort the filtered measures based on their order in validExplore.measures
+        .sort(
+          (a, b) =>
+            validExplore.measures!.indexOf(a.name!) -
+            validExplore.measures!.indexOf(b.name!),
+        )
     );
   };
 };

From 35407c56557c553d5c39a3276a860160a8053645 Mon Sep 17 00:00:00 2001
From: Aditya Hegde <adityahegderocks@gmail.com>
Date: Mon, 3 Feb 2025 19:14:31 +0530
Subject: [PATCH 42/48] feat: Custom logo UI support (#6521)

* Basic FileInput

* Add error state

* Add drag-drop support

* Add drop-over state and loading state

* Fix lint

* Support showing of custom logo

* Add remove support in UI

* Fix upload

* Add preview

* Imrpove preview
---
 .../settings/LogoSettings.svelte              | 150 ++++++++++++++++++
 .../settings/SettingsContainer.svelte         |   5 +-
 .../[organization]/-/settings/+page.svelte    |   4 +-
 .../src/components/forms/FileInput.svelte     |   2 +-
 web-common/src/components/icons/Rill.svelte   |   9 +-
 5 files changed, 165 insertions(+), 5 deletions(-)
 create mode 100644 web-admin/src/features/organizations/settings/LogoSettings.svelte

diff --git a/web-admin/src/features/organizations/settings/LogoSettings.svelte b/web-admin/src/features/organizations/settings/LogoSettings.svelte
new file mode 100644
index 00000000000..8c616be5a07
--- /dev/null
+++ b/web-admin/src/features/organizations/settings/LogoSettings.svelte
@@ -0,0 +1,150 @@
+<script lang="ts">
+  import { invalidateAll } from "$app/navigation";
+  import {
+    createAdminServiceCreateAsset,
+    createAdminServiceUpdateOrganization,
+    getAdminServiceGetOrganizationQueryKey,
+  } from "@rilldata/web-admin/client";
+  import { CANONICAL_ADMIN_URL } from "@rilldata/web-admin/client/http-client";
+  import SettingsContainer from "@rilldata/web-admin/features/organizations/settings/SettingsContainer.svelte";
+  import { Button } from "@rilldata/web-common/components/button";
+  import Rill from "@rilldata/web-common/components/icons/Rill.svelte";
+  import EditIcon from "@rilldata/web-common/components/icons/EditIcon.svelte";
+  import {
+    Popover,
+    PopoverContent,
+    PopoverTrigger,
+  } from "@rilldata/web-common/components/popover";
+  import { extractFileExtension } from "@rilldata/web-common/features/entity-management/file-path-utils";
+  import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
+  import { builderActions, getAttrs } from "bits-ui";
+  import FileInput from "@rilldata/web-common/components/forms/FileInput.svelte";
+
+  export let organization: string;
+  export let organizationLogoUrl: string | undefined;
+
+  $: logoUrl = organizationLogoUrl;
+
+  const assetCreator = createAdminServiceCreateAsset();
+  const orgUpdater = createAdminServiceUpdateOrganization();
+
+  let open = false;
+  let assetId = "";
+
+  async function uploadFile(file: File) {
+    const ext = extractFileExtension(file.name);
+    const assetResp = await $assetCreator.mutateAsync({
+      organizationName: organization,
+      data: {
+        type: "image",
+        name: "logo",
+        extension: ext,
+        cacheable: true,
+        estimatedSizeBytes: file.size.toString(),
+      },
+    });
+
+    await fetch(assetResp.signedUrl, {
+      method: "PUT",
+      body: file,
+      headers: assetResp.signingHeaders,
+    });
+    assetId = assetResp.assetId;
+    return `${CANONICAL_ADMIN_URL}/v1/assets/${assetId}/download`;
+  }
+
+  function onCancel() {
+    open = false;
+    logoUrl = organizationLogoUrl;
+  }
+
+  async function removeLogo() {
+    onCancel();
+    await $orgUpdater.mutateAsync({
+      name: organization,
+      data: {
+        logoAssetId: "",
+      },
+    });
+    void queryClient.invalidateQueries(
+      getAdminServiceGetOrganizationQueryKey(organization),
+    );
+    void invalidateAll();
+  }
+
+  async function onSave() {
+    onCancel();
+    await $orgUpdater.mutateAsync({
+      name: organization,
+      data: {
+        logoAssetId: assetId,
+      },
+    });
+    void queryClient.invalidateQueries(
+      getAdminServiceGetOrganizationQueryKey(organization),
+    );
+    void invalidateAll();
+  }
+</script>
+
+<SettingsContainer title="Logo" suppressFooter={!organizationLogoUrl}>
+  <div slot="body" class="flex flex-col gap-y-2">
+    <div>
+      Click to upload your logo and customize Rill for your organization.
+    </div>
+    <Popover
+      bind:open
+      onOpenChange={(o) => {
+        if (!o) onCancel();
+      }}
+    >
+      <PopoverTrigger asChild let:builder>
+        <button
+          class="flex items-center relative group h-[72px] border border-gray-300 hover:bg-slate-100 w-fit"
+          {...getAttrs([builder])}
+          use:builderActions={{ builders: [builder] }}
+          class:w-24={!organizationLogoUrl}
+          class:w-20={!!organizationLogoUrl}
+        >
+          <div class="m-auto px-4 w-fit h-10">
+            {#if organizationLogoUrl}
+              <img src={organizationLogoUrl} alt="logo" class="h-10" />
+            {:else}
+              <Rill width="64" height="40" />
+            {/if}
+          </div>
+          {#if !open}
+            <div
+              class="absolute -bottom-2 -right-2 rounded-2xl bg-slate-200 group-hover:bg-slate-500 w-6 h-6 px-1.5 py-[5px]"
+            >
+              <EditIcon
+                size="16px"
+                className="text-slate-600 group-hover:text-slate-50"
+              />
+            </div>
+          {/if}
+        </button>
+      </PopoverTrigger>
+      <PopoverContent
+        align="start"
+        side="bottom"
+        class="flex flex-col gap-y-2 w-[400px] p-4"
+      >
+        <div class="text-base font-medium">Upload org logo</div>
+        <FileInput bind:value={logoUrl} accept="image/*" {uploadFile} />
+        <div class="flex flex-row justify-end gap-x-2">
+          <Button type="secondary" on:click={onCancel}>Cancel</Button>
+          {#if organizationLogoUrl}
+            <Button type="secondary" on:click={removeLogo}>Remove</Button>
+          {/if}
+          <Button type="primary" on:click={onSave}>Save</Button>
+        </div>
+      </PopoverContent>
+    </Popover>
+  </div>
+  <svelte:fragment slot="action">
+    {#if organizationLogoUrl}
+      <Button type="secondary" on:click={removeLogo}>Remove</Button>
+    {/if}
+  </svelte:fragment>
+</SettingsContainer>
diff --git a/web-admin/src/features/organizations/settings/SettingsContainer.svelte b/web-admin/src/features/organizations/settings/SettingsContainer.svelte
index 97b6d05e281..60581b7bd9a 100644
--- a/web-admin/src/features/organizations/settings/SettingsContainer.svelte
+++ b/web-admin/src/features/organizations/settings/SettingsContainer.svelte
@@ -3,6 +3,9 @@
   import CancelCircle from "@rilldata/web-common/components/icons/CancelCircle.svelte";
   export let title: string;
   export let titleIcon: "none" | "info" | "error" = "none";
+  // Edge case with slots where conditional display breaks the logic.
+  // TODO: once we move out of slots we should get rid of this.
+  export let suppressFooter = false;
 </script>
 
 <div class="settings-container">
@@ -22,7 +25,7 @@
       {/if}
     </div>
   </div>
-  {#if $$slots["contact"] || $$slots["action"]}
+  {#if ($$slots["contact"] || $$slots["action"]) && !suppressFooter}
     <div class="settings-footer">
       <slot name="contact" />
       {#if $$slots["action"]}
diff --git a/web-admin/src/routes/[organization]/-/settings/+page.svelte b/web-admin/src/routes/[organization]/-/settings/+page.svelte
index 9033ab7ca12..0146451f90b 100644
--- a/web-admin/src/routes/[organization]/-/settings/+page.svelte
+++ b/web-admin/src/routes/[organization]/-/settings/+page.svelte
@@ -1,18 +1,20 @@
 <script lang="ts">
   import { page } from "$app/stores";
   import StartTeamPlanDialog from "@rilldata/web-admin/features/billing/plans/StartTeamPlanDialog.svelte";
+  import LogoSettings from "@rilldata/web-admin/features/organizations/settings/LogoSettings.svelte";
   import OrgNameSettings from "@rilldata/web-admin/features/organizations/settings/OrgNameSettings.svelte";
   import OrgDomainAllowListSettings from "@rilldata/web-admin/features/organizations/settings/OrgDomainAllowListSettings.svelte";
   import type { PageData } from "./$types";
 
   export let data: PageData;
 
-  $: ({ showUpgradeDialog } = data);
+  $: ({ showUpgradeDialog, organizationLogoUrl } = data);
 
   $: organization = $page.params.organization;
 </script>
 
 <OrgNameSettings {organization} />
+<LogoSettings {organization} {organizationLogoUrl} />
 <OrgDomainAllowListSettings {organization} />
 <!-- disabling for now since  there are some open questions around billing -->
 <!--  <DeleteOrg {organization} />-->
diff --git a/web-common/src/components/forms/FileInput.svelte b/web-common/src/components/forms/FileInput.svelte
index b97bab9751d..38d1a65ea83 100644
--- a/web-common/src/components/forms/FileInput.svelte
+++ b/web-common/src/components/forms/FileInput.svelte
@@ -150,7 +150,7 @@
   }
 
   .upload-button {
-    @apply flex flex-row gap-x-2.5 items-center justify-center py-5 min-h-10 w-80;
+    @apply flex flex-row gap-x-2.5 items-center justify-center py-5 min-h-10 min-w-80;
     @apply border border-neutral-400;
   }
 
diff --git a/web-common/src/components/icons/Rill.svelte b/web-common/src/components/icons/Rill.svelte
index a374136e114..c723c04c1cd 100644
--- a/web-common/src/components/icons/Rill.svelte
+++ b/web-common/src/components/icons/Rill.svelte
@@ -1,6 +1,11 @@
+<script lang="ts">
+  export let width = "27";
+  export let height = "16";
+</script>
+
 <svg
-  width="27"
-  height="16"
+  {width}
+  {height}
   viewBox="0 0 27 16"
   class="mb-[1px] flex-none"
   fill="none"

From 4eeb846a1d374c6f62e0128b1b52eb199981db25 Mon Sep 17 00:00:00 2001
From: Graham Plata <graham.plata@gmail.com>
Date: Mon, 3 Feb 2025 09:24:04 -0500
Subject: [PATCH 43/48] adjust controller fow

---
 runtime/server/controller.go | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/runtime/server/controller.go b/runtime/server/controller.go
index ee3d5a0577e..407b28e4aee 100644
--- a/runtime/server/controller.go
+++ b/runtime/server/controller.go
@@ -62,8 +62,10 @@ func (s *Server) ListResources(ctx context.Context, req *runtimev1.ListResources
 		return strings.Compare(an.Name, bn.Name)
 	})
 
-	isAdmin := auth.GetClaims(ctx).SecurityClaims().Admin()
-	if isAdmin && req.SkipChecks {
+	if req.SkipChecks {
+		if !auth.GetClaims(ctx).SecurityClaims().Admin() {
+			return nil, ErrForbidden
+		}
 		return &runtimev1.ListResourcesResponse{Resources: rs}, nil
 	}
 
@@ -182,9 +184,10 @@ func (s *Server) GetResource(ctx context.Context, req *runtimev1.GetResourceRequ
 		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
 
-	isAdmin := auth.GetClaims(ctx).SecurityClaims().Admin()
-
-	if isAdmin && req.SkipChecks {
+	if req.SkipChecks {
+		if !auth.GetClaims(ctx).SecurityClaims().Admin() {
+			return nil, ErrForbidden
+		}
 		return &runtimev1.GetResourceResponse{Resource: r}, nil
 	}
 
@@ -192,7 +195,7 @@ func (s *Server) GetResource(ctx context.Context, req *runtimev1.GetResourceRequ
 	if err != nil {
 		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
-	if !req.SkipChecks && !access {
+	if !access {
 		return nil, status.Error(codes.NotFound, "resource not found")
 	}
 

From 5c4b853812e18a4930a078d92a0ffae8bd92e0cf Mon Sep 17 00:00:00 2001
From: Graham Plata <graham.plata@gmail.com>
Date: Mon, 3 Feb 2025 09:30:15 -0500
Subject: [PATCH 44/48] update proto def

---
 proto/gen/rill/runtime/v1/api.pb.go           | 1232 +++++++++--------
 proto/gen/rill/runtime/v1/api.pb.validate.go  |    4 +-
 .../gen/rill/runtime/v1/runtime.swagger.yaml  |    4 +-
 proto/rill/runtime/v1/api.proto               |    4 +-
 runtime/server/controller.go                  |    8 +-
 .../src/proto/gen/rill/runtime/v1/api_pb.ts   |   12 +-
 .../src/runtime-client/gen/index.schemas.ts   |    4 +-
 7 files changed, 635 insertions(+), 633 deletions(-)

diff --git a/proto/gen/rill/runtime/v1/api.pb.go b/proto/gen/rill/runtime/v1/api.pb.go
index f2ffc567a8b..be43f232f65 100644
--- a/proto/gen/rill/runtime/v1/api.pb.go
+++ b/proto/gen/rill/runtime/v1/api.pb.go
@@ -3580,7 +3580,7 @@ type ListResourcesRequest struct {
 	// Filter by resource path (optional).
 	Path string `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"`
 	// Skip security checks
-	SkipChecks bool `protobuf:"varint,4,opt,name=skip_checks,json=skipChecks,proto3" json:"skip_checks,omitempty"`
+	SkipSecurityChecks bool `protobuf:"varint,4,opt,name=skip_security_checks,json=skipSecurityChecks,proto3" json:"skip_security_checks,omitempty"`
 }
 
 func (x *ListResourcesRequest) Reset() {
@@ -3636,9 +3636,9 @@ func (x *ListResourcesRequest) GetPath() string {
 	return ""
 }
 
-func (x *ListResourcesRequest) GetSkipChecks() bool {
+func (x *ListResourcesRequest) GetSkipSecurityChecks() bool {
 	if x != nil {
-		return x.SkipChecks
+		return x.SkipSecurityChecks
 	}
 	return false
 }
@@ -3829,9 +3829,9 @@ type GetResourceRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	InstanceId string        `protobuf:"bytes,1,opt,name=instance_id,json=instanceId,proto3" json:"instance_id,omitempty"`
-	Name       *ResourceName `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	SkipChecks bool          `protobuf:"varint,3,opt,name=skip_checks,json=skipChecks,proto3" json:"skip_checks,omitempty"`
+	InstanceId         string        `protobuf:"bytes,1,opt,name=instance_id,json=instanceId,proto3" json:"instance_id,omitempty"`
+	Name               *ResourceName `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	SkipSecurityChecks bool          `protobuf:"varint,3,opt,name=skip_security_checks,json=skipSecurityChecks,proto3" json:"skip_security_checks,omitempty"`
 }
 
 func (x *GetResourceRequest) Reset() {
@@ -3880,9 +3880,9 @@ func (x *GetResourceRequest) GetName() *ResourceName {
 	return nil
 }
 
-func (x *GetResourceRequest) GetSkipChecks() bool {
+func (x *GetResourceRequest) GetSkipSecurityChecks() bool {
 	if x != nil {
-		return x.SkipChecks
+		return x.SkipSecurityChecks
 	}
 	return false
 }
@@ -5895,637 +5895,639 @@ var file_rill_runtime_v1_api_proto_rawDesc = []byte{
 	0x63, 0x68, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x26,
 	0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x72, 0x69,
 	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x6f,
-	0x67, 0x52, 0x03, 0x6c, 0x6f, 0x67, 0x22, 0x80, 0x01, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x52,
+	0x67, 0x52, 0x03, 0x6c, 0x6f, 0x67, 0x22, 0x91, 0x01, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x52,
 	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
 	0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64,
 	0x12, 0x12, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
 	0x6b, 0x69, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x6b, 0x69, 0x70,
-	0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73,
-	0x6b, 0x69, 0x70, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x22, 0x50, 0x0a, 0x15, 0x4c, 0x69, 0x73,
-	0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x37, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0x7a, 0x0a, 0x15, 0x57,
-	0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x70,
-	0x6c, 0x61, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6c, 0x61,
-	0x79, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0xb8, 0x01, 0x0a, 0x16, 0x57, 0x61, 0x74, 0x63,
-	0x68, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x34, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0e, 0x32, 0x1e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x45, 0x76, 0x65, 0x6e,
-	0x74, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x31, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
+	0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x30, 0x0a, 0x14, 0x73, 0x6b, 0x69, 0x70,
+	0x5f, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x73, 0x6b, 0x69, 0x70, 0x53, 0x65, 0x63, 0x75,
+	0x72, 0x69, 0x74, 0x79, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x22, 0x50, 0x0a, 0x15, 0x4c, 0x69,
+	0x73, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x37, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
 	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x35, 0x0a, 0x08, 0x72,
-	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e,
-	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
-	0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x22, 0x89, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
-	0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
-	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a,
-	0x0b, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x0a, 0x73, 0x6b, 0x69, 0x70, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x22, 0x4c,
-	0x0a, 0x13, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x35, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0x7a, 0x0a, 0x15,
+	0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
+	0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65,
+	0x70, 0x6c, 0x61, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6c,
+	0x61, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0xb8, 0x01, 0x0a, 0x16, 0x57, 0x61, 0x74,
+	0x63, 0x68, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x34, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x45, 0x76, 0x65,
+	0x6e, 0x74, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x31, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
 	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x48, 0x0a, 0x11,
-	0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x87, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x45, 0x78,
-	0x70, 0x6c, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x33, 0x0a,
-	0x07, 0x65, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19,
+	0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x35, 0x0a, 0x08,
+	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19,
 	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
-	0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x07, 0x65, 0x78, 0x70, 0x6c, 0x6f,
-	0x72, 0x65, 0x12, 0x3c, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x76, 0x69,
-	0x65, 0x77, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
-	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x56, 0x69, 0x65, 0x77,
-	0x22, 0xce, 0x01, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61, 0x72,
-	0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f,
-	0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12,
-	0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
-	0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x70, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x12,
-	0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x07, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x65, 0x64, 0x12, 0x27, 0x0a, 0x09, 0x70, 0x61, 0x67,
-	0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x0a, 0xfa, 0x42,
-	0x07, 0x2a, 0x05, 0x18, 0x90, 0x4e, 0x40, 0x01, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69,
-	0x7a, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65,
-	0x6e, 0x22, 0x85, 0x01, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61,
-	0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x3f, 0x0a, 0x0a, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61, 0x72, 0x74,
-	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x12, 0x26, 0x0a, 0x0f, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74,
-	0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6e, 0x65, 0x78, 0x74,
-	0x50, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0xaf, 0x02, 0x0a, 0x14, 0x43, 0x72,
-	0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x49, 0x64, 0x12, 0x3b, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
-	0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
-	0x12, 0x3c, 0x0a, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
-	0x76, 0x31, 0x2e, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x54,
-	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x12, 0x16,
-	0x0a, 0x06, 0x70, 0x61, 0x72, 0x73, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
-	0x70, 0x61, 0x72, 0x73, 0x65, 0x72, 0x12, 0x2c, 0x0a, 0x12, 0x61, 0x6c, 0x6c, 0x5f, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x73, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x18, 0x07, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x10, 0x61, 0x6c, 0x6c, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x4d, 0x6f,
-	0x64, 0x65, 0x6c, 0x73, 0x12, 0x35, 0x0a, 0x17, 0x61, 0x6c, 0x6c, 0x5f, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x73, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x5f, 0x66, 0x75, 0x6c, 0x6c, 0x18,
-	0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x61, 0x6c, 0x6c, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x73, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x46, 0x75, 0x6c, 0x6c, 0x22, 0x17, 0x0a, 0x15, 0x43,
-	0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0xfb, 0x09, 0x0a, 0x0f, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x56, 0x0a, 0x11,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65,
-	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
-	0x74, 0x79, 0x52, 0x10, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
-	0x74, 0x69, 0x65, 0x73, 0x12, 0x56, 0x0a, 0x11, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x70,
-	0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
-	0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65,
-	0x72, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x52, 0x10, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, 0x21, 0x0a, 0x0c,
-	0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12,
-	0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x12, 0x2f, 0x0a, 0x13, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f,
-	0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12,
-	0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74,
-	0x72, 0x79, 0x12, 0x2d, 0x0a, 0x12, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73,
-	0x5f, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11,
-	0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f,
-	0x67, 0x12, 0x27, 0x0a, 0x0f, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f,
-	0x72, 0x65, 0x70, 0x6f, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x69, 0x6d, 0x70, 0x6c,
-	0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x70, 0x6f, 0x12, 0x29, 0x0a, 0x10, 0x69, 0x6d,
-	0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, 0x0d,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73,
-	0x41, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65,
-	0x6e, 0x74, 0x73, 0x5f, 0x61, 0x69, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x6d,
-	0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x41, 0x69, 0x12, 0x30, 0x0a, 0x14, 0x69, 0x6d,
-	0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x73, 0x71, 0x6c, 0x5f, 0x73, 0x74, 0x6f,
-	0x72, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d,
-	0x65, 0x6e, 0x74, 0x73, 0x53, 0x71, 0x6c, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x12, 0x27, 0x0a, 0x0f,
-	0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x6f, 0x6c, 0x61, 0x70, 0x18,
-	0x10, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74,
-	0x73, 0x4f, 0x6c, 0x61, 0x70, 0x12, 0x36, 0x0a, 0x17, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65,
-	0x6e, 0x74, 0x73, 0x5f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65,
-	0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e,
-	0x74, 0x73, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x12, 0x32, 0x0a,
-	0x15, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x66, 0x69, 0x6c, 0x65,
-	0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x69, 0x6d,
-	0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x46, 0x69, 0x6c, 0x65, 0x53, 0x74, 0x6f, 0x72,
-	0x65, 0x12, 0x2f, 0x0a, 0x13, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f,
-	0x6e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x13, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12,
-	0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69,
-	0x65, 0x72, 0x12, 0x31, 0x0a, 0x14, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73,
-	0x5f, 0x77, 0x61, 0x72, 0x65, 0x68, 0x6f, 0x75, 0x73, 0x65, 0x18, 0x14, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x13, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x57, 0x61, 0x72, 0x65,
-	0x68, 0x6f, 0x75, 0x73, 0x65, 0x1a, 0xda, 0x03, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
-	0x74, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x42, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x2e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
-	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72,
-	0x69, 0x76, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x54, 0x79,
-	0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x71, 0x75,
-	0x69, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x72, 0x65, 0x71, 0x75,
-	0x69, 0x72, 0x65, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x5f,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70,
-	0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x08, 0x64, 0x6f, 0x63,
-	0x73, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64, 0x6f, 0x63,
-	0x73, 0x55, 0x72, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x69, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x68, 0x69, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x66, 0x61,
-	0x75, 0x6c, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75,
-	0x6c, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65,
-	0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f,
-	0x6c, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x0a,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12, 0x1b, 0x0a, 0x09,
-	0x6e, 0x6f, 0x5f, 0x70, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x08, 0x6e, 0x6f, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x22, 0x77, 0x0a, 0x04, 0x54, 0x79, 0x70,
-	0x65, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43,
-	0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f,
-	0x4e, 0x55, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45,
-	0x5f, 0x42, 0x4f, 0x4f, 0x4c, 0x45, 0x41, 0x4e, 0x10, 0x02, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59,
-	0x50, 0x45, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x54,
-	0x59, 0x50, 0x45, 0x5f, 0x46, 0x49, 0x4c, 0x45, 0x10, 0x04, 0x12, 0x16, 0x0a, 0x12, 0x54, 0x59,
-	0x50, 0x45, 0x5f, 0x49, 0x4e, 0x46, 0x4f, 0x52, 0x4d, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x41, 0x4c,
-	0x10, 0x05, 0x22, 0x9d, 0x07, 0x0a, 0x11, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x43,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x38, 0x0a, 0x06,
-	0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x72,
-	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x06,
-	0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x12, 0x46, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65,
-	0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x59,
-	0x0a, 0x0d, 0x70, 0x72, 0x65, 0x73, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
-	0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64,
-	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x50, 0x72, 0x65, 0x73, 0x65, 0x74,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x70, 0x72, 0x65,
-	0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5c, 0x0a, 0x0e, 0x70, 0x72, 0x6f,
-	0x6a, 0x65, 0x63, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x05, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x35, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63,
-	0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x50, 0x0a, 0x0a, 0x65, 0x6e, 0x76, 0x5f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x72, 0x69,
-	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e,
-	0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e,
-	0x45, 0x6e, 0x76, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09,
-	0x65, 0x6e, 0x76, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x6f,
-	0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x70, 0x72,
-	0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x3e, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x76, 0x69,
-	0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x72, 0x67, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73,
-	0x69, 0x6f, 0x6e, 0x41, 0x72, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x14, 0x68, 0x61, 0x73, 0x5f, 0x61,
-	0x6e, 0x6f, 0x6e, 0x79, 0x6d, 0x6f, 0x75, 0x73, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x68, 0x61, 0x73, 0x41, 0x6e, 0x6f, 0x6e, 0x79, 0x6d,
-	0x6f, 0x75, 0x73, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x36, 0x0a, 0x07, 0x75, 0x73, 0x65,
-	0x64, 0x5f, 0x62, 0x79, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c,
+	0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x22, 0x9a, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e,
+	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
+	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x30,
+	0x0a, 0x14, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f,
+	0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x73, 0x6b,
+	0x69, 0x70, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73,
+	0x22, 0x4c, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x35, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
+	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x48,
+	0x0a, 0x11, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
+	0x63, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x87, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74,
+	0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x33, 0x0a, 0x07, 0x65, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x19, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+	0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x07, 0x65, 0x78, 0x70,
+	0x6c, 0x6f, 0x72, 0x65, 0x12, 0x3c, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f,
+	0x76, 0x69, 0x65, 0x77, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x69, 0x6c,
 	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x06, 0x75, 0x73, 0x65, 0x64, 0x42,
-	0x79, 0x12, 0x23, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x4d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	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, 0x1a, 0x3f, 0x0a, 0x11, 0x50, 0x72, 0x65, 0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 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, 0x1a, 0x40, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x43, 0x6f, 0x6e,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x56, 0x69,
+	0x65, 0x77, 0x22, 0xce, 0x01, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50,
+	0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49,
+	0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x65, 0x6e, 0x64, 0x69,
+	0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x70, 0x65, 0x6e, 0x64, 0x69, 0x6e,
+	0x67, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x07, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x65, 0x64, 0x12, 0x27, 0x0a, 0x09, 0x70,
+	0x61, 0x67, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x0a,
+	0xfa, 0x42, 0x07, 0x2a, 0x05, 0x18, 0x90, 0x4e, 0x40, 0x01, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65,
+	0x53, 0x69, 0x7a, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x6f, 0x6b,
+	0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x67, 0x65, 0x54, 0x6f,
+	0x6b, 0x65, 0x6e, 0x22, 0x85, 0x01, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c,
+	0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x3f, 0x0a, 0x0a, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61,
+	0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x12, 0x26, 0x0a, 0x0f, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x70, 0x61, 0x67, 0x65,
+	0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6e, 0x65,
+	0x78, 0x74, 0x50, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0xaf, 0x02, 0x0a, 0x14,
+	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61,
+	0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x3b, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x73, 0x12, 0x3c, 0x0a, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x18, 0x05, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4d, 0x6f, 0x64, 0x65,
+	0x6c, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73,
+	0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x73, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x06, 0x70, 0x61, 0x72, 0x73, 0x65, 0x72, 0x12, 0x2c, 0x0a, 0x12, 0x61, 0x6c, 0x6c, 0x5f,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x18, 0x07,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x61, 0x6c, 0x6c, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
+	0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x12, 0x35, 0x0a, 0x17, 0x61, 0x6c, 0x6c, 0x5f, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x73, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x5f, 0x66, 0x75, 0x6c,
+	0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x61, 0x6c, 0x6c, 0x53, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x73, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x46, 0x75, 0x6c, 0x6c, 0x22, 0x17, 0x0a,
+	0x15, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xfb, 0x09, 0x0a, 0x0f, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x56,
+	0x0a, 0x11, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
+	0x69, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
+	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x70,
+	0x65, 0x72, 0x74, 0x79, 0x52, 0x10, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x70,
+	0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, 0x56, 0x0a, 0x11, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69,
+	0x76, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x52, 0x10, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, 0x21,
+	0x0a, 0x0c, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d,
+	0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x2f, 0x0a, 0x13, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74,
+	0x73, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x12, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x67, 0x69,
+	0x73, 0x74, 0x72, 0x79, 0x12, 0x2d, 0x0a, 0x12, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e,
+	0x74, 0x73, 0x5f, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x11, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x43, 0x61, 0x74, 0x61,
+	0x6c, 0x6f, 0x67, 0x12, 0x27, 0x0a, 0x0f, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74,
+	0x73, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x69, 0x6d,
+	0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x70, 0x6f, 0x12, 0x29, 0x0a, 0x10,
+	0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x61, 0x64, 0x6d, 0x69, 0x6e,
+	0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e,
+	0x74, 0x73, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6d, 0x70, 0x6c, 0x65,
+	0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x61, 0x69, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c,
+	0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x41, 0x69, 0x12, 0x30, 0x0a, 0x14,
+	0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x73, 0x71, 0x6c, 0x5f, 0x73,
+	0x74, 0x6f, 0x72, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x69, 0x6d, 0x70, 0x6c,
+	0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x53, 0x71, 0x6c, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x12, 0x27,
+	0x0a, 0x0f, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x6f, 0x6c, 0x61,
+	0x70, 0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65,
+	0x6e, 0x74, 0x73, 0x4f, 0x6c, 0x61, 0x70, 0x12, 0x36, 0x0a, 0x17, 0x69, 0x6d, 0x70, 0x6c, 0x65,
+	0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x73, 0x74, 0x6f,
+	0x72, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d,
+	0x65, 0x6e, 0x74, 0x73, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x12,
+	0x32, 0x0a, 0x15, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x66, 0x69,
+	0x6c, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13,
+	0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x46, 0x69, 0x6c, 0x65, 0x53, 0x74,
+	0x6f, 0x72, 0x65, 0x12, 0x2f, 0x0a, 0x13, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74,
+	0x73, 0x5f, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x13, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x12, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x4e, 0x6f, 0x74, 0x69,
+	0x66, 0x69, 0x65, 0x72, 0x12, 0x31, 0x0a, 0x14, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e,
+	0x74, 0x73, 0x5f, 0x77, 0x61, 0x72, 0x65, 0x68, 0x6f, 0x75, 0x73, 0x65, 0x18, 0x14, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x13, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x57, 0x61,
+	0x72, 0x65, 0x68, 0x6f, 0x75, 0x73, 0x65, 0x1a, 0xda, 0x03, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x70,
+	0x65, 0x72, 0x74, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x42, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
+	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
+	0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x2e,
+	0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65,
+	0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x72, 0x65,
+	0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61,
+	0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69,
+	0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
+	0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x08, 0x64,
+	0x6f, 0x63, 0x73, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64,
+	0x6f, 0x63, 0x73, 0x55, 0x72, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x69, 0x6e, 0x74, 0x18, 0x07,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x69, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65,
+	0x66, 0x61, 0x75, 0x6c, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64, 0x65, 0x66,
+	0x61, 0x75, 0x6c, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c,
+	0x64, 0x65, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x6c, 0x61, 0x63, 0x65,
+	0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74,
+	0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12, 0x1b,
+	0x0a, 0x09, 0x6e, 0x6f, 0x5f, 0x70, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x08, 0x6e, 0x6f, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x22, 0x77, 0x0a, 0x04, 0x54,
+	0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50,
+	0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50,
+	0x45, 0x5f, 0x4e, 0x55, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59,
+	0x50, 0x45, 0x5f, 0x42, 0x4f, 0x4f, 0x4c, 0x45, 0x41, 0x4e, 0x10, 0x02, 0x12, 0x0f, 0x0a, 0x0b,
+	0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x03, 0x12, 0x0d, 0x0a,
+	0x09, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x49, 0x4c, 0x45, 0x10, 0x04, 0x12, 0x16, 0x0a, 0x12,
+	0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x4e, 0x46, 0x4f, 0x52, 0x4d, 0x41, 0x54, 0x49, 0x4f, 0x4e,
+	0x41, 0x4c, 0x10, 0x05, 0x22, 0x9d, 0x07, 0x0a, 0x11, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65,
+	0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x38,
+	0x0a, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20,
+	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
+	0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72,
+	0x52, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x12, 0x46, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79,
+	0x7a, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x12, 0x59, 0x0a, 0x0d, 0x70, 0x72, 0x65, 0x73, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a,
+	0x65, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x50, 0x72, 0x65, 0x73,
+	0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x70,
+	0x72, 0x65, 0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5c, 0x0a, 0x0e, 0x70,
+	0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x05, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x43, 0x6f,
+	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x6a,
+	0x65, 0x63, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x50, 0x0a, 0x0a, 0x65, 0x6e, 0x76,
+	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e,
+	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
+	0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f,
+	0x72, 0x2e, 0x45, 0x6e, 0x76, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x52, 0x09, 0x65, 0x6e, 0x76, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x70,
+	0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09,
+	0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x3e, 0x0a, 0x0e, 0x70, 0x72, 0x6f,
+	0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x72, 0x67, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x76,
+	0x69, 0x73, 0x69, 0x6f, 0x6e, 0x41, 0x72, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x14, 0x68, 0x61, 0x73,
+	0x5f, 0x61, 0x6e, 0x6f, 0x6e, 0x79, 0x6d, 0x6f, 0x75, 0x73, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73,
+	0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x68, 0x61, 0x73, 0x41, 0x6e, 0x6f, 0x6e,
+	0x79, 0x6d, 0x6f, 0x75, 0x73, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x36, 0x0a, 0x07, 0x75,
+	0x73, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72,
+	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x06, 0x75, 0x73, 0x65,
+	0x64, 0x42, 0x79, 0x12, 0x23, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73,
+	0x73, 0x61, 0x67, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x65, 0x72, 0x72, 0x6f,
+	0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 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, 0x1a, 0x3f, 0x0a, 0x11, 0x50, 0x72, 0x65, 0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e,
 	0x66, 0x69, 0x67, 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, 0x1a, 0x3c, 0x0a, 0x0e, 0x45, 0x6e, 0x76, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 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, 0x1d, 0x0a, 0x1b, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x22, 0x60, 0x0a, 0x1c, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x40, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x6f, 0x72, 0x73, 0x22, 0x3b, 0x0a, 0x18, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x43, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64,
-	0x22, 0x5f, 0x0a, 0x19, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x42, 0x0a,
-	0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
-	0x73, 0x22, 0x40, 0x0a, 0x1d, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65,
-	0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x49, 0x64, 0x22, 0x5c, 0x0a, 0x1e, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66,
-	0x69, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3a, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x6f, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
-	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
-	0x73, 0x22, 0x7e, 0x0a, 0x12, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x05, 0x65, 0x6d,
-	0x61, 0x69, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x03, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x61,
-	0x64, 0x6d, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x61, 0x64, 0x6d, 0x69,
-	0x6e, 0x22, 0x27, 0x0a, 0x13, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6a, 0x77, 0x74, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6a, 0x77, 0x74, 0x22, 0x3a, 0x0a, 0x17, 0x41, 0x6e,
-	0x61, 0x6c, 0x79, 0x7a, 0x65, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74,
-	0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x22, 0x5b, 0x0a, 0x18, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a,
-	0x65, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x3f, 0x0a, 0x09, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64,
-	0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x09, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62,
-	0x6c, 0x65, 0x73, 0x22, 0x83, 0x01, 0x0a, 0x10, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64,
-	0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x23, 0x0a, 0x0d,
-	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x12, 0x36, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x08, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
-	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4e, 0x61, 0x6d,
-	0x65, 0x52, 0x06, 0x75, 0x73, 0x65, 0x64, 0x42, 0x79, 0x2a, 0x54, 0x0a, 0x09, 0x46, 0x69, 0x6c,
-	0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x16, 0x46, 0x49, 0x4c, 0x45, 0x5f, 0x45,
-	0x56, 0x45, 0x4e, 0x54, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44,
-	0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x46, 0x49, 0x4c, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54,
-	0x5f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11, 0x46, 0x49, 0x4c, 0x45,
-	0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x02, 0x2a,
-	0x8c, 0x01, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x19, 0x0a, 0x15,
-	0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43,
-	0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x4c, 0x4f, 0x47, 0x5f, 0x4c,
-	0x45, 0x56, 0x45, 0x4c, 0x5f, 0x44, 0x45, 0x42, 0x55, 0x47, 0x10, 0x04, 0x12, 0x12, 0x0a, 0x0e,
-	0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0x08,
-	0x12, 0x12, 0x0a, 0x0e, 0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x57, 0x41,
-	0x52, 0x4e, 0x10, 0x0c, 0x12, 0x13, 0x0a, 0x0f, 0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45,
-	0x4c, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x10, 0x12, 0x13, 0x0a, 0x0f, 0x4c, 0x4f, 0x47,
-	0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x46, 0x41, 0x54, 0x41, 0x4c, 0x10, 0x14, 0x2a, 0x64,
-	0x0a, 0x0d, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12,
-	0x1e, 0x0a, 0x1a, 0x52, 0x45, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e,
-	0x54, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12,
-	0x18, 0x0a, 0x14, 0x52, 0x45, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e,
-	0x54, 0x5f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x10, 0x01, 0x12, 0x19, 0x0a, 0x15, 0x52, 0x45, 0x53,
-	0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x44, 0x45, 0x4c, 0x45,
-	0x54, 0x45, 0x10, 0x02, 0x32, 0xcd, 0x25, 0x0a, 0x0e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x55, 0x0a, 0x04, 0x50, 0x69, 0x6e, 0x67, 0x12,
-	0x1c, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
-	0x31, 0x2e, 0x50, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e,
-	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
-	0x50, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x10, 0x82, 0xd3,
-	0xe4, 0x93, 0x02, 0x0a, 0x12, 0x08, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x5d,
-	0x0a, 0x06, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, 0x1e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
-	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74,
-	0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
-	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74,
-	0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x12, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x0c, 0x12, 0x0a, 0x2f, 0x76, 0x31, 0x2f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, 0x8d, 0x01,
-	0x0a, 0x0e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68,
-	0x12, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
-	0x76, 0x31, 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74,
-	0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
-	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x2a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x12, 0x22, 0x2f, 0x76, 0x31, 0x2f, 0x68,
-	0x65, 0x61, 0x6c, 0x74, 0x68, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f,
-	0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x12, 0x75, 0x0a,
-	0x0d, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x25,
-	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
-	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x73, 0x74,
-	0x61, 0x6e, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x15, 0x82,
-	0xd3, 0xe4, 0x93, 0x02, 0x0f, 0x12, 0x0d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x73, 0x12, 0x7d, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x12, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
-	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e,
-	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x23,
-	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x12, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74,
-	0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f,
-	0x69, 0x64, 0x7d, 0x12, 0x7b, 0x0a, 0x0e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e,
-	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e,
+	0x3a, 0x02, 0x38, 0x01, 0x1a, 0x40, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 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, 0x1a, 0x3c, 0x0a, 0x0e, 0x45, 0x6e, 0x76, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 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, 0x1d, 0x0a, 0x1b, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x22, 0x60, 0x0a, 0x1c, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x40, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x6f, 0x72, 0x73, 0x22, 0x3b, 0x0a, 0x18, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65,
+	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x49, 0x64, 0x22, 0x5f, 0x0a, 0x19, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x43, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x42, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x43, 0x6f,
+	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x73, 0x22, 0x40, 0x0a, 0x1d, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66,
+	0x69, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61,
+	0x6e, 0x63, 0x65, 0x49, 0x64, 0x22, 0x5c, 0x0a, 0x1e, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74,
+	0x69, 0x66, 0x69, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3a, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x72, 0x69,
+	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f,
+	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x73, 0x22, 0x7e, 0x0a, 0x12, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a,
+	0x57, 0x54, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01,
+	0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x05,
+	0x65, 0x6d, 0x61, 0x69, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18,
+	0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, 0x14, 0x0a,
+	0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x61, 0x64,
+	0x6d, 0x69, 0x6e, 0x22, 0x27, 0x0a, 0x13, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a,
+	0x57, 0x54, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6a, 0x77,
+	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6a, 0x77, 0x74, 0x22, 0x3a, 0x0a, 0x17,
+	0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61,
+	0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e,
+	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x22, 0x5b, 0x0a, 0x18, 0x41, 0x6e, 0x61, 0x6c,
+	0x79, 0x7a, 0x65, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x09, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a,
+	0x65, 0x64, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x09, 0x76, 0x61, 0x72, 0x69,
+	0x61, 0x62, 0x6c, 0x65, 0x73, 0x22, 0x83, 0x01, 0x0a, 0x10, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a,
+	0x65, 0x64, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x23,
+	0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x12, 0x36, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x08,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
+	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4e,
+	0x61, 0x6d, 0x65, 0x52, 0x06, 0x75, 0x73, 0x65, 0x64, 0x42, 0x79, 0x2a, 0x54, 0x0a, 0x09, 0x46,
+	0x69, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x16, 0x46, 0x49, 0x4c, 0x45,
+	0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49,
+	0x45, 0x44, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x46, 0x49, 0x4c, 0x45, 0x5f, 0x45, 0x56, 0x45,
+	0x4e, 0x54, 0x5f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11, 0x46, 0x49,
+	0x4c, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10,
+	0x02, 0x2a, 0x8c, 0x01, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x19,
+	0x0a, 0x15, 0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x55, 0x4e, 0x53, 0x50,
+	0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x4c, 0x4f, 0x47,
+	0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x44, 0x45, 0x42, 0x55, 0x47, 0x10, 0x04, 0x12, 0x12,
+	0x0a, 0x0e, 0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x49, 0x4e, 0x46, 0x4f,
+	0x10, 0x08, 0x12, 0x12, 0x0a, 0x0e, 0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f,
+	0x57, 0x41, 0x52, 0x4e, 0x10, 0x0c, 0x12, 0x13, 0x0a, 0x0f, 0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45,
+	0x56, 0x45, 0x4c, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x10, 0x12, 0x13, 0x0a, 0x0f, 0x4c,
+	0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x46, 0x41, 0x54, 0x41, 0x4c, 0x10, 0x14,
+	0x2a, 0x64, 0x0a, 0x0d, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x45, 0x76, 0x65, 0x6e,
+	0x74, 0x12, 0x1e, 0x0a, 0x1a, 0x52, 0x45, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x45, 0x56,
+	0x45, 0x4e, 0x54, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10,
+	0x00, 0x12, 0x18, 0x0a, 0x14, 0x52, 0x45, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x45, 0x56,
+	0x45, 0x4e, 0x54, 0x5f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x10, 0x01, 0x12, 0x19, 0x0a, 0x15, 0x52,
+	0x45, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x44, 0x45,
+	0x4c, 0x45, 0x54, 0x45, 0x10, 0x02, 0x32, 0xcd, 0x25, 0x0a, 0x0e, 0x52, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x55, 0x0a, 0x04, 0x50, 0x69, 0x6e,
+	0x67, 0x12, 0x1c, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x2e, 0x76, 0x31, 0x2e, 0x50, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
+	0x31, 0x2e, 0x50, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x10,
+	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0a, 0x12, 0x08, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x69, 0x6e, 0x67,
+	0x12, 0x5d, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, 0x1e, 0x2e, 0x72, 0x69, 0x6c,
+	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x65, 0x61,
+	0x6c, 0x74, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x72, 0x69, 0x6c,
+	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x65, 0x61,
+	0x6c, 0x74, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x12, 0x82, 0xd3, 0xe4,
+	0x93, 0x02, 0x0c, 0x12, 0x0a, 0x2f, 0x76, 0x31, 0x2f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12,
+	0x8d, 0x01, 0x0a, 0x0e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c,
+	0x74, 0x68, 0x12, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x48, 0x65, 0x61,
+	0x6c, 0x74, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x72, 0x69, 0x6c,
+	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x73,
+	0x74, 0x61, 0x6e, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x2a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x12, 0x22, 0x2f, 0x76, 0x31,
+	0x2f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x12,
+	0x75, 0x0a, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73,
+	0x12, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+	0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e,
+	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x15, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0f, 0x12, 0x0d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73,
+	0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x7d, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x73,
+	0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61,
+	0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x72, 0x69, 0x6c,
+	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
+	0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x12, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e,
+	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
+	0x65, 0x5f, 0x69, 0x64, 0x7d, 0x12, 0x7b, 0x0a, 0x0e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49,
+	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
+	0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x18, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12,
+	0x3a, 0x01, 0x2a, 0x22, 0x0d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
+	0x65, 0x73, 0x12, 0x83, 0x01, 0x0a, 0x0c, 0x45, 0x64, 0x69, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61,
+	0x6e, 0x63, 0x65, 0x12, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e,
+	0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
+	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x64, 0x69, 0x74,
+	0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x26, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x20, 0x3a, 0x01, 0x2a, 0x32, 0x1b, 0x2f, 0x76, 0x31,
+	0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x12, 0x89, 0x01, 0x0a, 0x0e, 0x44, 0x65, 0x6c,
+	0x65, 0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x26, 0x2e, 0x72, 0x69,
+	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65,
+	0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0x82, 0xd3,
+	0xe4, 0x93, 0x02, 0x20, 0x3a, 0x01, 0x2a, 0x22, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73,
+	0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x5f, 0x69, 0x64, 0x7d, 0x12, 0x7d, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x65,
+	0x73, 0x12, 0x21, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
+	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x73,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23,
+	0x12, 0x21, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f,
+	0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69,
+	0x6c, 0x65, 0x73, 0x12, 0x88, 0x01, 0x0a, 0x0a, 0x57, 0x61, 0x74, 0x63, 0x68, 0x46, 0x69, 0x6c,
+	0x65, 0x73, 0x12, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x46, 0x69,
+	0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4,
+	0x93, 0x02, 0x29, 0x12, 0x27, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
+	0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d,
+	0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x30, 0x01, 0x12, 0x7d,
+	0x0a, 0x07, 0x47, 0x65, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
+	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x46,
+	0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x72, 0x69, 0x6c,
+	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
+	0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3,
+	0xe4, 0x93, 0x02, 0x29, 0x12, 0x27, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
+	0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64,
+	0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x80, 0x01,
+	0x0a, 0x07, 0x50, 0x75, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
+	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x75, 0x74, 0x46,
+	0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x72, 0x69, 0x6c,
+	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x75, 0x74,
+	0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x32, 0x82, 0xd3,
+	0xe4, 0x93, 0x02, 0x2c, 0x3a, 0x01, 0x2a, 0x22, 0x27, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73,
+	0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x65, 0x6e, 0x74, 0x72, 0x79,
+	0x12, 0x96, 0x01, 0x0a, 0x0f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x72, 0x65, 0x63,
+	0x74, 0x6f, 0x72, 0x79, 0x12, 0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
+	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x72,
+	0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e,
 	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
-	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x18, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12, 0x3a, 0x01,
-	0x2a, 0x22, 0x0d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73,
-	0x12, 0x83, 0x01, 0x0a, 0x0c, 0x45, 0x64, 0x69, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x12, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x49, 0x6e,
-	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26,
-	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x20, 0x3a, 0x01, 0x2a, 0x32, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x69,
+	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x30, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2a, 0x3a,
+	0x01, 0x2a, 0x22, 0x25, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f,
+	0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x64, 0x69, 0x72, 0x12, 0x86, 0x01, 0x0a, 0x0a, 0x44, 0x65,
+	0x6c, 0x65, 0x74, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74,
+	0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x72,
+	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44,
+	0x65, 0x6c, 0x65, 0x74, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x2a, 0x27, 0x2f, 0x76, 0x31, 0x2f, 0x69,
 	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x12, 0x89, 0x01, 0x0a, 0x0e, 0x44, 0x65, 0x6c, 0x65, 0x74,
-	0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
-	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65,
-	0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0x82, 0xd3, 0xe4, 0x93,
-	0x02, 0x20, 0x3a, 0x01, 0x2a, 0x22, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61,
+	0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x65, 0x6e, 0x74,
+	0x72, 0x79, 0x12, 0x8a, 0x01, 0x0a, 0x0a, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x46, 0x69, 0x6c,
+	0x65, 0x12, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x46, 0x69,
+	0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x33, 0x82, 0xd3, 0xe4, 0x93,
+	0x02, 0x2d, 0x3a, 0x01, 0x2a, 0x22, 0x28, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61,
 	0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69,
-	0x64, 0x7d, 0x12, 0x7d, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x12,
-	0x21, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
-	0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
-	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x12, 0x21,
+	0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x72, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x12,
+	0x71, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x12,
+	0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
+	0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d,
+	0x70, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x14, 0x82, 0xd3,
+	0xe4, 0x93, 0x02, 0x0e, 0x12, 0x0c, 0x2f, 0x76, 0x31, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c,
+	0x65, 0x73, 0x12, 0x9b, 0x01, 0x0a, 0x0d, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x78, 0x61,
+	0x6d, 0x70, 0x6c, 0x65, 0x12, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
+	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x78, 0x61,
+	0x6d, 0x70, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69,
+	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e,
+	0x70, 0x61, 0x63, 0x6b, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x3b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x35, 0x3a, 0x01, 0x2a, 0x22, 0x30,
 	0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69,
 	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65,
-	0x73, 0x12, 0x88, 0x01, 0x0a, 0x0a, 0x57, 0x61, 0x74, 0x63, 0x68, 0x46, 0x69, 0x6c, 0x65, 0x73,
-	0x12, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
-	0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x46, 0x69, 0x6c, 0x65,
-	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x29, 0x12, 0x27, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73,
-	0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66,
-	0x69, 0x6c, 0x65, 0x73, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x30, 0x01, 0x12, 0x7d, 0x0a, 0x07,
-	0x47, 0x65, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x46, 0x69, 0x6c,
-	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
-	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x46, 0x69,
-	0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93,
-	0x02, 0x29, 0x12, 0x27, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f,
-	0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x80, 0x01, 0x0a, 0x07,
-	0x50, 0x75, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x75, 0x74, 0x46, 0x69, 0x6c,
-	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
-	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x75, 0x74, 0x46, 0x69,
-	0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x32, 0x82, 0xd3, 0xe4, 0x93,
-	0x02, 0x2c, 0x3a, 0x01, 0x2a, 0x22, 0x27, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69,
-	0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x96,
-	0x01, 0x0a, 0x0f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0x79, 0x12, 0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
-	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x72, 0x65, 0x63,
-	0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x72, 0x69,
-	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72,
-	0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x30, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2a, 0x3a, 0x01, 0x2a,
-	0x22, 0x25, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f,
+	0x73, 0x2f, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x2d, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65,
+	0x12, 0x93, 0x01, 0x0a, 0x0b, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x6d, 0x70, 0x74, 0x79,
+	0x12, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+	0x76, 0x31, 0x2e, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x6d,
+	0x70, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x39, 0x82, 0xd3, 0xe4,
+	0x93, 0x02, 0x33, 0x3a, 0x01, 0x2a, 0x22, 0x2e, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f,
+	0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b,
+	0x2d, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x12, 0xc0, 0x01, 0x0a, 0x17, 0x47, 0x65, 0x6e, 0x65, 0x72,
+	0x61, 0x74, 0x65, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x56, 0x69, 0x65, 0x77, 0x46, 0x69,
+	0x6c, 0x65, 0x12, 0x2f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x74,
+	0x72, 0x69, 0x63, 0x73, 0x56, 0x69, 0x65, 0x77, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x30, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x4d, 0x65,
+	0x74, 0x72, 0x69, 0x63, 0x73, 0x56, 0x69, 0x65, 0x77, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x42, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x3c, 0x3a, 0x01, 0x2a,
+	0x22, 0x37, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f,
 	0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69,
-	0x6c, 0x65, 0x73, 0x2f, 0x64, 0x69, 0x72, 0x12, 0x86, 0x01, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65,
-	0x74, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x46,
-	0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x72, 0x69, 0x6c,
-	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c,
-	0x65, 0x74, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x2a, 0x27, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x65, 0x6e, 0x74, 0x72, 0x79,
-	0x12, 0x8a, 0x01, 0x0a, 0x0a, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x12,
-	0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
-	0x31, 0x2e, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x46, 0x69, 0x6c, 0x65,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x33, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2d,
-	0x3a, 0x01, 0x2a, 0x22, 0x28, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d,
-	0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x72, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x71, 0x0a,
-	0x0c, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x12, 0x24, 0x2e,
-	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
-	0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c,
-	0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x14, 0x82, 0xd3, 0xe4, 0x93,
-	0x02, 0x0e, 0x12, 0x0c, 0x2f, 0x76, 0x31, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73,
-	0x12, 0x9b, 0x01, 0x0a, 0x0d, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x78, 0x61, 0x6d, 0x70,
-	0x6c, 0x65, 0x12, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
-	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x78, 0x61, 0x6d, 0x70,
-	0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
-	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x70, 0x61,
-	0x63, 0x6b, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x3b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x35, 0x3a, 0x01, 0x2a, 0x22, 0x30, 0x2f, 0x76,
-	0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f,
-	0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x2d, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x93,
-	0x01, 0x0a, 0x0b, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x23,
+	0x6c, 0x65, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x2d, 0x6d, 0x65, 0x74,
+	0x72, 0x69, 0x63, 0x73, 0x2d, 0x76, 0x69, 0x65, 0x77, 0x12, 0xa1, 0x01, 0x0a, 0x10, 0x47, 0x65,
+	0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x12, 0x28,
 	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
-	0x2e, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x6d, 0x70, 0x74,
-	0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x39, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x33, 0x3a, 0x01, 0x2a, 0x22, 0x2e, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64,
-	0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x2d, 0x65,
-	0x6d, 0x70, 0x74, 0x79, 0x12, 0xc0, 0x01, 0x0a, 0x17, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74,
-	0x65, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x56, 0x69, 0x65, 0x77, 0x46, 0x69, 0x6c, 0x65,
-	0x12, 0x2f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
-	0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x74, 0x72, 0x69,
-	0x63, 0x73, 0x56, 0x69, 0x65, 0x77, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x30, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x74, 0x72,
-	0x69, 0x63, 0x73, 0x56, 0x69, 0x65, 0x77, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x42, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x3c, 0x3a, 0x01, 0x2a, 0x22, 0x37,
+	0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65,
+	0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72,
+	0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x38, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x32, 0x3a, 0x01, 0x2a, 0x22, 0x2d,
 	0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69,
-	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65,
-	0x73, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x2d, 0x6d, 0x65, 0x74, 0x72, 0x69,
-	0x63, 0x73, 0x2d, 0x76, 0x69, 0x65, 0x77, 0x12, 0xa1, 0x01, 0x0a, 0x10, 0x47, 0x65, 0x6e, 0x65,
-	0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x12, 0x28, 0x2e, 0x72,
+	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x67, 0x65, 0x6e, 0x65,
+	0x72, 0x61, 0x74, 0x65, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x12, 0xa1, 0x01,
+	0x0a, 0x10, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72,
+	0x65, 0x72, 0x12, 0x28, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x6e,
+	0x64, 0x65, 0x72, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x72,
 	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47,
-	0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74,
-	0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x38, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x32, 0x3a, 0x01, 0x2a, 0x22, 0x2d, 0x2f, 0x76,
-	0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61,
-	0x74, 0x65, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x12, 0xa1, 0x01, 0x0a, 0x10,
-	0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72,
-	0x12, 0x28, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
-	0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x6e, 0x64, 0x65,
-	0x72, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x72, 0x69, 0x6c,
-	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e,
-	0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x38, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x32, 0x3a, 0x01, 0x2a,
-	0x22, 0x2d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f,
-	0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x67, 0x65,
-	0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x2f, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x12,
-	0x76, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x1f, 0x2e, 0x72, 0x69, 0x6c,
-	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
-	0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x72, 0x69,
-	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65,
-	0x74, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x28, 0x82,
-	0xd3, 0xe4, 0x93, 0x02, 0x22, 0x12, 0x20, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69,
-	0x64, 0x7d, 0x2f, 0x6c, 0x6f, 0x67, 0x73, 0x12, 0x84, 0x01, 0x0a, 0x09, 0x57, 0x61, 0x74, 0x63,
-	0x68, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x21, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x6f, 0x67,
-	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
-	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68,
-	0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2e, 0x82, 0xd3,
-	0xe4, 0x93, 0x02, 0x28, 0x12, 0x26, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64,
-	0x7d, 0x2f, 0x6c, 0x6f, 0x67, 0x73, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x30, 0x01, 0x12, 0x8d,
-	0x01, 0x0a, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
-	0x12, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
-	0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x2d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x27, 0x12, 0x25, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73,
+	0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x38, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x32, 0x3a,
+	0x01, 0x2a, 0x22, 0x2d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f,
+	0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x2f, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65,
+	0x72, 0x12, 0x76, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x1f, 0x2e, 0x72,
+	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47,
+	0x65, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e,
+	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
+	0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x28, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x12, 0x20, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73,
 	0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x9a,
-	0x01, 0x0a, 0x0e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x73, 0x12, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
-	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63,
-	0x68, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x35, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2f, 0x12, 0x2d, 0x2f, 0x76, 0x31, 0x2f,
-	0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x73, 0x2f, 0x2d, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x30, 0x01, 0x12, 0x86, 0x01, 0x0a, 0x0b,
-	0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x23, 0x2e, 0x72, 0x69,
-	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65,
-	0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
-	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26, 0x12, 0x24,
-	0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69,
-	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x12, 0x8c, 0x01, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6c,
-	0x6f, 0x72, 0x65, 0x12, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70,
-	0x6c, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x35, 0x82, 0xd3,
-	0xe4, 0x93, 0x02, 0x2f, 0x12, 0x2d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64,
-	0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x65, 0x78, 0x70, 0x6c,
-	0x6f, 0x72, 0x65, 0x12, 0xac, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c,
-	0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2a, 0x2e, 0x72, 0x69, 0x6c,
-	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
-	0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65,
-	0x6c, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x3d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x37, 0x12, 0x35, 0x2f, 0x76, 0x31,
-	0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74,
-	0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f,
-	0x7b, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x7d, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x12, 0x8e, 0x01, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x69,
-	0x67, 0x67, 0x65, 0x72, 0x12, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x69,
-	0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69,
-	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72,
-	0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x2e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x28, 0x3a, 0x01, 0x2a, 0x22, 0x23,
-	0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69,
-	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x74, 0x72, 0x69, 0x67,
-	0x67, 0x65, 0x72, 0x12, 0x90, 0x01, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x12, 0x2c, 0x2e, 0x72,
+	0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6c, 0x6f, 0x67, 0x73, 0x12, 0x84, 0x01, 0x0a, 0x09, 0x57, 0x61,
+	0x74, 0x63, 0x68, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x21, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4c,
+	0x6f, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x72, 0x69, 0x6c,
+	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74,
+	0x63, 0x68, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2e,
+	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x28, 0x12, 0x26, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f,
+	0x69, 0x64, 0x7d, 0x2f, 0x6c, 0x6f, 0x67, 0x73, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x30, 0x01,
+	0x12, 0x8d, 0x01, 0x0a, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x73, 0x12, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
+	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74,
+	0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x2d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x27, 0x12, 0x25, 0x2f, 0x76, 0x31, 0x2f, 0x69,
+	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
+	0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
+	0x12, 0x9a, 0x01, 0x0a, 0x0e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x73, 0x12, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x72, 0x69,
+	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61,
+	0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x35, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2f, 0x12, 0x2d, 0x2f, 0x76,
+	0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73,
+	0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x73, 0x2f, 0x2d, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x30, 0x01, 0x12, 0x86, 0x01,
+	0x0a, 0x0b, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x23, 0x2e,
+	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
+	0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26,
+	0x12, 0x24, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f,
+	0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x72, 0x65,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x8c, 0x01, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x45, 0x78,
+	0x70, 0x6c, 0x6f, 0x72, 0x65, 0x12, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6c, 0x6f,
+	0x72, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
+	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x45,
+	0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x35,
+	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2f, 0x12, 0x2d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f,
+	0x69, 0x64, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x65, 0x78,
+	0x70, 0x6c, 0x6f, 0x72, 0x65, 0x12, 0xac, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x4d, 0x6f, 0x64,
+	0x65, 0x6c, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2a, 0x2e, 0x72,
+	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47,
+	0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x6f,
+	0x64, 0x65, 0x6c, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x3d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x37, 0x12, 0x35, 0x2f,
+	0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e,
+	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c,
+	0x73, 0x2f, 0x7b, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x7d, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x12, 0x8e, 0x01, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54,
+	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x12, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54,
+	0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e,
+	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
+	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x28, 0x3a, 0x01, 0x2a,
+	0x22, 0x23, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f,
+	0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x74, 0x72,
+	0x69, 0x67, 0x67, 0x65, 0x72, 0x12, 0x90, 0x01, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f,
+	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x12, 0x2c,
+	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
+	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72,
+	0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x72,
 	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c,
 	0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76,
-	0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x72, 0x69, 0x6c,
-	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73,
-	0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72,
-	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1b, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x15, 0x12, 0x13, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
-	0x73, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x12, 0xa2, 0x01, 0x0a, 0x11, 0x41, 0x6e, 0x61, 0x6c, 0x79,
-	0x7a, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x29, 0x2e, 0x72,
-	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41,
-	0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a,
-	0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x36, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x30, 0x12, 0x2e, 0x2f, 0x76, 0x31,
-	0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74,
-	0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x6f, 0x72, 0x73, 0x2f, 0x61, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x12, 0xb3, 0x01, 0x0a, 0x16,
-	0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x2e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74,
-	0x69, 0x66, 0x69, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74,
-	0x69, 0x66, 0x69, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x38, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x32, 0x12,
-	0x30, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b,
-	0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x63, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x2f, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72,
-	0x73, 0x12, 0x70, 0x0a, 0x0b, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54,
-	0x12, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
-	0x76, 0x31, 0x2e, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76,
-	0x4a, 0x57, 0x54, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x16, 0x82, 0xd3, 0xe4,
-	0x93, 0x02, 0x10, 0x3a, 0x01, 0x2a, 0x22, 0x0b, 0x2f, 0x76, 0x31, 0x2f, 0x64, 0x65, 0x76, 0x2d,
-	0x6a, 0x77, 0x74, 0x12, 0x9e, 0x01, 0x0a, 0x10, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x56,
-	0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x28, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
-	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79,
-	0x7a, 0x65, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
-	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x56, 0x61, 0x72, 0x69,
-	0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x35, 0x82,
-	0xd3, 0xe4, 0x93, 0x02, 0x2f, 0x12, 0x2d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69,
-	0x64, 0x7d, 0x2f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x2f, 0x61, 0x6e, 0x61,
-	0x6c, 0x79, 0x7a, 0x65, 0x42, 0xbb, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x72, 0x69, 0x6c,
-	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x08, 0x41, 0x70,
-	0x69, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, 0x69, 0x6c, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x72, 0x69,
-	0x6c, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x72, 0x69, 0x6c,
-	0x6c, 0x2f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x52, 0x52, 0x58, 0xaa, 0x02, 0x0f, 0x52,
-	0x69, 0x6c, 0x6c, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02,
-	0x0f, 0x52, 0x69, 0x6c, 0x6c, 0x5c, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5c, 0x56, 0x31,
-	0xe2, 0x02, 0x1b, 0x52, 0x69, 0x6c, 0x6c, 0x5c, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5c,
-	0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02,
-	0x11, 0x52, 0x69, 0x6c, 0x6c, 0x3a, 0x3a, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x3a, 0x3a,
-	0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1b, 0x82, 0xd3, 0xe4,
+	0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x73, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x12, 0xa2, 0x01, 0x0a, 0x11, 0x41, 0x6e, 0x61,
+	0x6c, 0x79, 0x7a, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x29,
+	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
+	0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f,
+	0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
+	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c,
+	0x79, 0x7a, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x36, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x30, 0x12, 0x2e, 0x2f,
+	0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e,
+	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x6f, 0x72, 0x73, 0x2f, 0x61, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x12, 0xb3, 0x01,
+	0x0a, 0x16, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x43, 0x6f,
+	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x2e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4e,
+	0x6f, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
+	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4e,
+	0x6f, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
+	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x38, 0x82, 0xd3, 0xe4, 0x93, 0x02,
+	0x32, 0x12, 0x30, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73,
+	0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x63,
+	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x2f, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x69,
+	0x65, 0x72, 0x73, 0x12, 0x70, 0x0a, 0x0b, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a,
+	0x57, 0x54, 0x12, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44,
+	0x65, 0x76, 0x4a, 0x57, 0x54, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x16, 0x82,
+	0xd3, 0xe4, 0x93, 0x02, 0x10, 0x3a, 0x01, 0x2a, 0x22, 0x0b, 0x2f, 0x76, 0x31, 0x2f, 0x64, 0x65,
+	0x76, 0x2d, 0x6a, 0x77, 0x74, 0x12, 0x9e, 0x01, 0x0a, 0x10, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a,
+	0x65, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x28, 0x2e, 0x72, 0x69, 0x6c,
+	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61,
+	0x6c, 0x79, 0x7a, 0x65, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
+	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x56, 0x61,
+	0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x35, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2f, 0x12, 0x2d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73,
+	0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x2f, 0x61,
+	0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x42, 0xbb, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x72,
+	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x08,
+	0x41, 0x70, 0x69, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, 0x69, 0x6c, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2f,
+	0x72, 0x69, 0x6c, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x72,
+	0x69, 0x6c, 0x6c, 0x2f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x52, 0x52, 0x58, 0xaa, 0x02,
+	0x0f, 0x52, 0x69, 0x6c, 0x6c, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x56, 0x31,
+	0xca, 0x02, 0x0f, 0x52, 0x69, 0x6c, 0x6c, 0x5c, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5c,
+	0x56, 0x31, 0xe2, 0x02, 0x1b, 0x52, 0x69, 0x6c, 0x6c, 0x5c, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
+	0xea, 0x02, 0x11, 0x52, 0x69, 0x6c, 0x6c, 0x3a, 0x3a, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/proto/gen/rill/runtime/v1/api.pb.validate.go b/proto/gen/rill/runtime/v1/api.pb.validate.go
index 1925539f96a..5664d77993d 100644
--- a/proto/gen/rill/runtime/v1/api.pb.validate.go
+++ b/proto/gen/rill/runtime/v1/api.pb.validate.go
@@ -6778,7 +6778,7 @@ func (m *ListResourcesRequest) validate(all bool) error {
 
 	// no validation rules for Path
 
-	// no validation rules for SkipChecks
+	// no validation rules for SkipSecurityChecks
 
 	if len(errors) > 0 {
 		return ListResourcesRequestMultiError(errors)
@@ -7321,7 +7321,7 @@ func (m *GetResourceRequest) validate(all bool) error {
 		}
 	}
 
-	// no validation rules for SkipChecks
+	// no validation rules for SkipSecurityChecks
 
 	if len(errors) > 0 {
 		return GetResourceRequestMultiError(errors)
diff --git a/proto/gen/rill/runtime/v1/runtime.swagger.yaml b/proto/gen/rill/runtime/v1/runtime.swagger.yaml
index 3d5618ac0da..6415bd06404 100644
--- a/proto/gen/rill/runtime/v1/runtime.swagger.yaml
+++ b/proto/gen/rill/runtime/v1/runtime.swagger.yaml
@@ -2542,7 +2542,7 @@ paths:
           in: query
           required: false
           type: string
-        - name: skipChecks
+        - name: skipSecurityChecks
           in: query
           required: false
           type: boolean
@@ -2577,7 +2577,7 @@ paths:
           in: query
           required: false
           type: string
-        - name: skipChecks
+        - name: skipSecurityChecks
           description: Skip security checks
           in: query
           required: false
diff --git a/proto/rill/runtime/v1/api.proto b/proto/rill/runtime/v1/api.proto
index 25cfe9cf0d7..8fab26cb59a 100644
--- a/proto/rill/runtime/v1/api.proto
+++ b/proto/rill/runtime/v1/api.proto
@@ -652,7 +652,7 @@ message ListResourcesRequest {
   // Filter by resource path (optional).
   string path = 3;
   // Skip security checks
-  bool skip_checks = 4;
+  bool skip_security_checks = 4;
 }
 
 message ListResourcesResponse {
@@ -675,7 +675,7 @@ message WatchResourcesResponse {
 message GetResourceRequest {
   string instance_id = 1;
   ResourceName name = 2;
-  bool skip_checks = 3;
+  bool skip_security_checks = 3;
 }
 
 message GetResourceResponse {
diff --git a/runtime/server/controller.go b/runtime/server/controller.go
index 407b28e4aee..e260a9af074 100644
--- a/runtime/server/controller.go
+++ b/runtime/server/controller.go
@@ -33,7 +33,7 @@ func (s *Server) ListResources(ctx context.Context, req *runtimev1.ListResources
 	observability.AddRequestAttributes(ctx,
 		attribute.String("args.instance_id", req.InstanceId),
 		attribute.String("args.kind", req.Kind),
-		attribute.Bool("args.skip_checks", req.SkipChecks),
+		attribute.Bool("args.skip_checks", req.SkipSecurityChecks),
 	)
 
 	if !auth.GetClaims(ctx).CanInstance(req.InstanceId, auth.ReadObjects) {
@@ -62,7 +62,7 @@ func (s *Server) ListResources(ctx context.Context, req *runtimev1.ListResources
 		return strings.Compare(an.Name, bn.Name)
 	})
 
-	if req.SkipChecks {
+	if req.SkipSecurityChecks {
 		if !auth.GetClaims(ctx).SecurityClaims().Admin() {
 			return nil, ErrForbidden
 		}
@@ -164,7 +164,7 @@ func (s *Server) GetResource(ctx context.Context, req *runtimev1.GetResourceRequ
 		attribute.String("args.instance_id", req.InstanceId),
 		attribute.String("args.name.kind", req.Name.Kind),
 		attribute.String("args.name.name", req.Name.Name),
-		attribute.Bool("args.skip_checks", req.SkipChecks),
+		attribute.Bool("args.skip_checks", req.SkipSecurityChecks),
 	)
 
 	if !auth.GetClaims(ctx).CanInstance(req.InstanceId, auth.ReadObjects) {
@@ -184,7 +184,7 @@ func (s *Server) GetResource(ctx context.Context, req *runtimev1.GetResourceRequ
 		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
 
-	if req.SkipChecks {
+	if req.SkipSecurityChecks {
 		if !auth.GetClaims(ctx).SecurityClaims().Admin() {
 			return nil, ErrForbidden
 		}
diff --git a/web-common/src/proto/gen/rill/runtime/v1/api_pb.ts b/web-common/src/proto/gen/rill/runtime/v1/api_pb.ts
index caa9a53e034..e45badf798e 100644
--- a/web-common/src/proto/gen/rill/runtime/v1/api_pb.ts
+++ b/web-common/src/proto/gen/rill/runtime/v1/api_pb.ts
@@ -2804,9 +2804,9 @@ export class ListResourcesRequest extends Message<ListResourcesRequest> {
   /**
    * Skip security checks
    *
-   * @generated from field: bool skip_checks = 4;
+   * @generated from field: bool skip_security_checks = 4;
    */
-  skipChecks = false;
+  skipSecurityChecks = false;
 
   constructor(data?: PartialMessage<ListResourcesRequest>) {
     super();
@@ -2819,7 +2819,7 @@ export class ListResourcesRequest extends Message<ListResourcesRequest> {
     { no: 1, name: "instance_id", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 2, name: "kind", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 3, name: "path", kind: "scalar", T: 9 /* ScalarType.STRING */ },
-    { no: 4, name: "skip_checks", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
+    { no: 4, name: "skip_security_checks", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): ListResourcesRequest {
@@ -2995,9 +2995,9 @@ export class GetResourceRequest extends Message<GetResourceRequest> {
   name?: ResourceName;
 
   /**
-   * @generated from field: bool skip_checks = 3;
+   * @generated from field: bool skip_security_checks = 3;
    */
-  skipChecks = false;
+  skipSecurityChecks = false;
 
   constructor(data?: PartialMessage<GetResourceRequest>) {
     super();
@@ -3009,7 +3009,7 @@ export class GetResourceRequest extends Message<GetResourceRequest> {
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
     { no: 1, name: "instance_id", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 2, name: "name", kind: "message", T: ResourceName },
-    { no: 3, name: "skip_checks", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
+    { no: 3, name: "skip_security_checks", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): GetResourceRequest {
diff --git a/web-common/src/runtime-client/gen/index.schemas.ts b/web-common/src/runtime-client/gen/index.schemas.ts
index 2528f305762..f4f7231a6e1 100644
--- a/web-common/src/runtime-client/gen/index.schemas.ts
+++ b/web-common/src/runtime-client/gen/index.schemas.ts
@@ -69,13 +69,13 @@ export type RuntimeServiceWatchResourcesParams = {
 export type RuntimeServiceListResourcesParams = {
   kind?: string;
   path?: string;
-  skipChecks?: boolean;
+  skipSecurityChecks?: boolean;
 };
 
 export type RuntimeServiceGetResourceParams = {
   "name.kind"?: string;
   "name.name"?: string;
-  skipChecks?: boolean;
+  skipSecurityChecks?: boolean;
 };
 
 export type QueryServiceExportReportBody = {

From ad5843f3a1b57e47c8b1df0a2b54d2d40e9dd086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Egelund-M=C3=BCller?= <b@egelund-muller.com>
Date: Mon, 3 Feb 2025 15:57:58 +0100
Subject: [PATCH 45/48] Improves DSN config error messages that are confusing
 in cloud (#6565)

---
 runtime/drivers/mysql/mysql.go                               | 2 +-
 runtime/drivers/postgres/postgres.go                         | 2 +-
 runtime/drivers/snowflake/model_executor_self_objectstore.go | 2 +-
 runtime/drivers/snowflake/snowflake.go                       | 2 +-
 runtime/drivers/snowflake/warehouse.go                       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/runtime/drivers/mysql/mysql.go b/runtime/drivers/mysql/mysql.go
index 7253ea48373..d230f4a0c82 100644
--- a/runtime/drivers/mysql/mysql.go
+++ b/runtime/drivers/mysql/mysql.go
@@ -42,7 +42,7 @@ var spec = drivers.Spec{
 			Required:    false,
 			DocsURL:     "https://github.com/go-sql-driver/mysql?tab=readme-ov-file#dsn-data-source-name",
 			Placeholder: "username:password@tcp(example.com:3306)/my-db",
-			Hint:        "Either set this or pass --env connector.mysql.dsn=... to rill start",
+			Hint:        "Can be configured here or by setting the 'connector.mysql.dsn' environment variable (using '.env' or '--env')",
 		},
 		{
 			Key:         "name",
diff --git a/runtime/drivers/postgres/postgres.go b/runtime/drivers/postgres/postgres.go
index 948ae5c44cc..3396eebcccc 100644
--- a/runtime/drivers/postgres/postgres.go
+++ b/runtime/drivers/postgres/postgres.go
@@ -40,7 +40,7 @@ var spec = drivers.Spec{
 			Required:    false,
 			DocsURL:     "https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING",
 			Placeholder: "postgresql://postgres:postgres@localhost:5432/postgres",
-			Hint:        "Either set this or pass --env connector.postgres.database_url=... to rill start",
+			Hint:        "Can be configured here or by setting the 'connector.postgres.database_url' environment variable (using '.env' or '--env')",
 		},
 		{
 			Key:         "name",
diff --git a/runtime/drivers/snowflake/model_executor_self_objectstore.go b/runtime/drivers/snowflake/model_executor_self_objectstore.go
index e5cc05e1edc..7fee500c6a4 100644
--- a/runtime/drivers/snowflake/model_executor_self_objectstore.go
+++ b/runtime/drivers/snowflake/model_executor_self_objectstore.go
@@ -70,7 +70,7 @@ func (e *selfToObjectStoreExecutor) export(ctx context.Context, props map[string
 	} else if e.c.configProperties.DSN != "" { // get from driver configs
 		dsn = e.c.configProperties.DSN
 	} else {
-		return "", fmt.Errorf("the property 'dsn' is required for Snowflake. Provide 'dsn' in the YAML properties or pass '--env connector.snowflake.dsn=...' to 'rill start'")
+		return "", fmt.Errorf("the property 'dsn' is required for Snowflake: configure it in the YAML properties or set the 'connector.snowflake.dsn' environment variable")
 	}
 
 	db, err := otelsql.Open("snowflake", dsn)
diff --git a/runtime/drivers/snowflake/snowflake.go b/runtime/drivers/snowflake/snowflake.go
index 678b105aed3..495da3185a7 100644
--- a/runtime/drivers/snowflake/snowflake.go
+++ b/runtime/drivers/snowflake/snowflake.go
@@ -45,7 +45,7 @@ var spec = drivers.Spec{
 			Required:    false,
 			DocsURL:     "https://pkg.go.dev/github.com/snowflakedb/gosnowflake#hdr-Connection_String",
 			Placeholder: "my_user_name:my_password@ac123456/my_database/my_schema?warehouse=my_warehouse&role=my_user_role",
-			Hint:        "Either set this or pass --env connector.snowflake.dsn=... to rill start",
+			Hint:        "Can be configured here or by setting the 'connector.snowflake.dsn' environment variable (using '.env' or '--env')",
 		},
 		{
 			Key:         "name",
diff --git a/runtime/drivers/snowflake/warehouse.go b/runtime/drivers/snowflake/warehouse.go
index 8e3fe2729ed..8e64144eba3 100644
--- a/runtime/drivers/snowflake/warehouse.go
+++ b/runtime/drivers/snowflake/warehouse.go
@@ -45,7 +45,7 @@ func (c *connection) QueryAsFiles(ctx context.Context, props map[string]any) (it
 	} else if c.configProperties.DSN != "" { // get from driver configs
 		dsn = c.configProperties.DSN
 	} else {
-		return nil, fmt.Errorf("the property 'dsn' is required for Snowflake. Provide 'dsn' in the YAML properties or pass '--env connector.snowflake.dsn=...' to 'rill start'")
+		return nil, fmt.Errorf("the property 'dsn' is required for Snowflake: configure it in the YAML properties or set the 'connector.snowflake.dsn' environment variable")
 	}
 
 	parallelFetchLimit := 5

From 56cd169a0e72f954f8ae004d2bb6bca76fae1fca Mon Sep 17 00:00:00 2001
From: Cyrus Goh <hello@cyrusgoh.com>
Date: Mon, 3 Feb 2025 08:30:16 -0800
Subject: [PATCH 46/48] Canvas: Inline add components (#6529)

* selected component index null directly

* inline add component

* fix spacing

* granular events handling for triggering contextmenu

* shared menu items

* remove dup contextmenu in blank canvas

* remove add component menu

* lint

* remove unused

* re-add ml-2 to canvas filters

* Revert "remove add component menu"

This reverts commit d7a17659dc459a2a2b38b39cf481f8462c13c90e.

* add component
---
 .../src/features/canvas/BlankCanvas.svelte    | 64 +++---------------
 web-common/src/features/canvas/Canvas.svelte  | 66 +++++++++++++++----
 .../canvas/CanvasDashboardPreview.svelte      | 15 +----
 .../canvas/components/AddComponentMenu.svelte | 18 +----
 .../canvas/components/menu-items.svelte       | 22 +++++++
 .../canvas/filters/CanvasFilters.svelte       |  7 +-
 .../workspaces/CanvasWorkspace.svelte         |  8 +--
 7 files changed, 95 insertions(+), 105 deletions(-)
 create mode 100644 web-common/src/features/canvas/components/menu-items.svelte

diff --git a/web-common/src/features/canvas/BlankCanvas.svelte b/web-common/src/features/canvas/BlankCanvas.svelte
index 7613ae1840d..4eb6888b1a8 100644
--- a/web-common/src/features/canvas/BlankCanvas.svelte
+++ b/web-common/src/features/canvas/BlankCanvas.svelte
@@ -1,36 +1,5 @@
 <script lang="ts">
   import { PlusCircleIcon } from "lucide-svelte";
-  import {
-    ContextMenu,
-    ContextMenuContent,
-    ContextMenuItem,
-    ContextMenuTrigger,
-  } from "@rilldata/web-common/components/context-menu";
-  import type { CanvasComponentType } from "./components/types";
-  import type { ComponentType, SvelteComponent } from "svelte";
-  import ChartIcon from "./icons/ChartIcon.svelte";
-  import TableIcon from "./icons/TableIcon.svelte";
-  import TextIcon from "./icons/TextIcon.svelte";
-  import BigNumberIcon from "./icons/BigNumberIcon.svelte";
-  import { createEventDispatcher } from "svelte";
-
-  const dispatch = createEventDispatcher();
-
-  const menuItems: {
-    id: CanvasComponentType;
-    label: string;
-    icon: ComponentType<SvelteComponent>;
-  }[] = [
-    { id: "bar_chart", label: "Chart", icon: ChartIcon },
-    { id: "table", label: "Table", icon: TableIcon },
-    { id: "markdown", label: "Text", icon: TextIcon },
-    { id: "kpi", label: "KPI", icon: BigNumberIcon },
-    { id: "image", label: "Image", icon: ChartIcon },
-  ];
-
-  function handleAddComponent(componentType: CanvasComponentType) {
-    dispatch("add", { type: componentType });
-  }
 
   function handleButtonClick(event: MouseEvent) {
     const contextMenuEvent = new MouseEvent("contextmenu", {
@@ -43,31 +12,14 @@
 </script>
 
 <div class="size-full p-4 bg-white">
-  <ContextMenu>
-    <ContextMenuTrigger>
-      <button
-        type="button"
-        class="blank-canvas-button flex flex-col items-center gap-2 p-8 rounded-[6px] border border-slate-200 w-full"
-        on:click={handleButtonClick}
-      >
-        <PlusCircleIcon class="w-6 h-6 text-slate-500" />
-        <span class="text-sm font-medium text-slate-500">Add a component</span>
-      </button>
-    </ContextMenuTrigger>
-    <ContextMenuContent>
-      {#each menuItems as item}
-        <ContextMenuItem
-          on:click={() => handleAddComponent(item.id)}
-          class="text-gray-700 text-xs"
-        >
-          <div class="flex flex-row gap-x-2">
-            <svelte:component this={item.icon} />
-            <span class="text-gray-700 text-xs font-normal">{item.label}</span>
-          </div>
-        </ContextMenuItem>
-      {/each}
-    </ContextMenuContent>
-  </ContextMenu>
+  <button
+    type="button"
+    class="blank-canvas-button flex flex-col items-center gap-2 p-8 rounded-[6px] border border-slate-200 w-full"
+    on:click={handleButtonClick}
+  >
+    <PlusCircleIcon class="w-6 h-6 text-slate-500" />
+    <span class="text-sm font-medium text-slate-500">Add a component</span>
+  </button>
 </div>
 
 <style lang="postcss">
diff --git a/web-common/src/features/canvas/Canvas.svelte b/web-common/src/features/canvas/Canvas.svelte
index eb5b7f08cb4..5928386ffb5 100644
--- a/web-common/src/features/canvas/Canvas.svelte
+++ b/web-common/src/features/canvas/Canvas.svelte
@@ -12,6 +12,13 @@
   import type { CanvasComponentType } from "./components/types";
   import BlankCanvas from "./BlankCanvas.svelte";
   import CanvasFilters from "@rilldata/web-common/features/canvas/filters/CanvasFilters.svelte";
+  import {
+    ContextMenu,
+    ContextMenuContent,
+    ContextMenuItem,
+    ContextMenuTrigger,
+  } from "@rilldata/web-common/components/context-menu";
+  import { menuItems } from "./components/menu-items.svelte";
 
   export let fileArtifact: FileArtifact;
 
@@ -177,6 +184,22 @@
   async function handleAdd(e: CustomEvent<{ type: CanvasComponentType }>) {
     await addComponent(e.detail.type);
   }
+
+  function handleContextMenu(
+    event: CustomEvent<{ originalEvent: MouseEvent }>,
+  ) {
+    const target = event.detail.originalEvent.target as HTMLElement;
+    const gridStackEl = target.closest(".grid-stack-item");
+
+    // Prevent context menu if clicking on a grid item
+    if (gridStackEl) {
+      event.detail.originalEvent.preventDefault();
+      event.detail.originalEvent.stopPropagation();
+      event.preventDefault();
+      event.stopPropagation();
+      return false;
+    }
+  }
 </script>
 
 {#if filtersEnabled}
@@ -188,17 +211,38 @@
   </div>
 {/if}
 
-{#if items.length === 0}
-  <BlankCanvas on:add={handleAdd} />
-{:else}
-  <CanvasDashboardPreview
-    {items}
-    {spec}
-    activeIndex={$selectedIndex}
-    on:update={handleUpdate}
-    on:delete={handleDelete}
-  />
-{/if}
+<ContextMenu>
+  <ContextMenuTrigger
+    class="h-full w-full block"
+    on:contextmenu={handleContextMenu}
+  >
+    {#if items.length === 0}
+      <BlankCanvas />
+    {:else}
+      <CanvasDashboardPreview
+        {items}
+        {spec}
+        activeIndex={$selectedIndex}
+        on:update={handleUpdate}
+        on:delete={handleDelete}
+      />
+    {/if}
+  </ContextMenuTrigger>
+  <ContextMenuContent>
+    {#each menuItems as item}
+      <ContextMenuItem
+        on:click={() =>
+          handleAdd(new CustomEvent("add", { detail: { type: item.id } }))}
+        class="text-gray-700 text-xs"
+      >
+        <div class="flex flex-row gap-x-2">
+          <svelte:component this={item.icon} />
+          <span class="text-gray-700 text-xs font-normal">{item.label}</span>
+        </div>
+      </ContextMenuItem>
+    {/each}
+  </ContextMenuContent>
+</ContextMenu>
 
 <svelte:window
   on:keydown={async (e) => {
diff --git a/web-common/src/features/canvas/CanvasDashboardPreview.svelte b/web-common/src/features/canvas/CanvasDashboardPreview.svelte
index ae58548212e..04ab181e621 100644
--- a/web-common/src/features/canvas/CanvasDashboardPreview.svelte
+++ b/web-common/src/features/canvas/CanvasDashboardPreview.svelte
@@ -107,8 +107,7 @@
   }
 
   function handleDeselect() {
-    activeIndex = null;
-    canvasEntity.setSelectedComponentIndex(activeIndex);
+    canvasEntity.setSelectedComponentIndex(null);
   }
 
   function handleClickOutside(event: Event) {
@@ -121,21 +120,11 @@
 
     // Only deselect if click is inside canvas or dashboard-theme-boundary but outside grid-stack
     if ((canvasEl || dashboardThemeBoundaryEl) && !gridStackEl) {
-      activeIndex = null;
-      canvasEntity.setSelectedComponentIndex(activeIndex);
+      canvasEntity.setSelectedComponentIndex(null);
     }
   }
 </script>
 
-<!-- {#if showFilterBar}
-  <div
-    id="header"
-    class="border-b w-fit min-w-full flex flex-col bg-slate-50 slide"
-  >
-    <CanvasFilters />
-  </div>
-{/if} -->
-
 <CanvasDashboardWrapper bind:contentRect height={maxBottom}>
   <div bind:this={gridContainer} use:clickOutside={[null, handleClickOutside]}>
     <SvelteGridStack
diff --git a/web-common/src/features/canvas/components/AddComponentMenu.svelte b/web-common/src/features/canvas/components/AddComponentMenu.svelte
index 35fa202f39f..08e44e014be 100644
--- a/web-common/src/features/canvas/components/AddComponentMenu.svelte
+++ b/web-common/src/features/canvas/components/AddComponentMenu.svelte
@@ -3,27 +3,11 @@
   import * as DropdownMenu from "@rilldata/web-common/components/dropdown-menu";
   import type { CanvasComponentType } from "@rilldata/web-common/features/canvas/components/types";
   import { ChevronDown, Plus } from "lucide-svelte";
-  import type { ComponentType, SvelteComponent } from "svelte";
-  import ChartIcon from "../icons/ChartIcon.svelte";
-  import TableIcon from "../icons/TableIcon.svelte";
-  import TextIcon from "../icons/TextIcon.svelte";
-  import BigNumberIcon from "../icons/BigNumberIcon.svelte";
+  import { menuItems } from "./menu-items.svelte";
 
   export let addComponent: (componentType: CanvasComponentType) => void;
 
   let open = false;
-
-  const menuItems: {
-    id: CanvasComponentType;
-    label: string;
-    icon: ComponentType<SvelteComponent>;
-  }[] = [
-    { id: "bar_chart", label: "Chart", icon: ChartIcon },
-    { id: "table", label: "Table", icon: TableIcon },
-    { id: "markdown", label: "Text", icon: TextIcon },
-    { id: "kpi", label: "KPI", icon: BigNumberIcon },
-    { id: "image", label: "Image", icon: ChartIcon },
-  ];
 </script>
 
 <DropdownMenu.Root bind:open typeahead={false}>
diff --git a/web-common/src/features/canvas/components/menu-items.svelte b/web-common/src/features/canvas/components/menu-items.svelte
new file mode 100644
index 00000000000..e05a4fa1e6f
--- /dev/null
+++ b/web-common/src/features/canvas/components/menu-items.svelte
@@ -0,0 +1,22 @@
+<script lang="ts" context="module">
+  import type { CanvasComponentType } from "./types";
+  import ChartIcon from "../icons/ChartIcon.svelte";
+  import TableIcon from "../icons/TableIcon.svelte";
+  import TextIcon from "../icons/TextIcon.svelte";
+  import BigNumberIcon from "../icons/BigNumberIcon.svelte";
+  import type { ComponentType, SvelteComponent } from "svelte";
+
+  export type MenuItem = {
+    id: CanvasComponentType;
+    label: string;
+    icon: ComponentType<SvelteComponent>;
+  };
+
+  export const menuItems: MenuItem[] = [
+    { id: "bar_chart", label: "Chart", icon: ChartIcon },
+    { id: "table", label: "Table", icon: TableIcon },
+    { id: "markdown", label: "Text", icon: TextIcon },
+    { id: "kpi", label: "KPI", icon: BigNumberIcon },
+    { id: "image", label: "Image", icon: ChartIcon },
+  ];
+</script>
diff --git a/web-common/src/features/canvas/filters/CanvasFilters.svelte b/web-common/src/features/canvas/filters/CanvasFilters.svelte
index 7616c5618e5..ccd54826a4f 100644
--- a/web-common/src/features/canvas/filters/CanvasFilters.svelte
+++ b/web-common/src/features/canvas/filters/CanvasFilters.svelte
@@ -90,8 +90,8 @@
   }
 </script>
 
-<div class="flex flex-col gap-y-2 w-full h-20 justify-center ml-2">
-  <div class="flex flex-row flex-wrap gap-x-2 gap-y-1.5 items-center">
+<div class="flex flex-col gap-y-2 w-full h-20 justify-center">
+  <div class="flex flex-row flex-wrap gap-x-2 gap-y-1.5 items-center ml-2">
     <Calendar size="16px" />
     <CanvasSuperPill
       allTimeRange={$allTimeRange}
@@ -108,8 +108,7 @@
       selectedComparisonTimeRange={$selectedComparisonTimeRange}
     />
   </div>
-
-  <div class="relative flex flex-row gap-x-2 gap-y-2 items-start">
+  <div class="relative flex flex-row gap-x-2 gap-y-2 items-start ml-2">
     {#if !readOnly}
       <Filter size="16px" className="ui-copy-icon flex-none mt-[5px]" />
     {/if}
diff --git a/web-common/src/features/workspaces/CanvasWorkspace.svelte b/web-common/src/features/workspaces/CanvasWorkspace.svelte
index e59efdb2244..1a424bb78c0 100644
--- a/web-common/src/features/workspaces/CanvasWorkspace.svelte
+++ b/web-common/src/features/workspaces/CanvasWorkspace.svelte
@@ -4,8 +4,6 @@
   import Canvas from "@rilldata/web-common/features/canvas/Canvas.svelte";
   import CanvasEditor from "@rilldata/web-common/features/canvas/CanvasEditor.svelte";
   import CanvasThemeProvider from "@rilldata/web-common/features/canvas/CanvasThemeProvider.svelte";
-  import AddComponentMenu from "@rilldata/web-common/features/canvas/components/AddComponentMenu.svelte";
-  import type { CanvasComponentType } from "@rilldata/web-common/features/canvas/components/types";
   import { getComponentRegistry } from "@rilldata/web-common/features/canvas/components/util";
   import VisualCanvasEditing from "@rilldata/web-common/features/canvas/inspector/VisualCanvasEditing.svelte";
   import { useDefaultMetrics } from "@rilldata/web-common/features/canvas/selector";
@@ -27,9 +25,11 @@
   import WorkspaceEditorContainer from "@rilldata/web-common/layout/workspace/WorkspaceEditorContainer.svelte";
   import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-  import { parseDocument } from "yaml";
   import PreviewButton from "../explores/PreviewButton.svelte";
-  import { findNextAvailablePosition } from "@rilldata/web-common/features/canvas/util";
+  import type { CanvasComponentType } from "../canvas/components/types";
+  import { parseDocument } from "yaml";
+  import { findNextAvailablePosition } from "../canvas/util";
+  import AddComponentMenu from "../canvas/components/AddComponentMenu.svelte";
 
   export let fileArtifact: FileArtifact;
 

From 15ee9b7bb0b6f0b8803608b33a6897223dbf2e42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Egelund-M=C3=BCller?= <b@egelund-muller.com>
Date: Mon, 3 Feb 2025 20:21:28 +0100
Subject: [PATCH 47/48] Support custom attributes in `mock_users` and
 `IssueDevJWT` (#6518)

---
 proto/gen/rill/runtime/v1/api.pb.go           | 856 +++++++++---------
 proto/gen/rill/runtime/v1/api.pb.validate.go  |  29 +
 .../gen/rill/runtime/v1/runtime.swagger.yaml  |   5 +
 proto/rill/runtime/v1/api.proto               |   3 +
 runtime/compilers/rillv1/parse_rillyaml.go    |   9 +-
 runtime/compilers/rillv1/parser_test.go       |   4 +
 runtime/server/server.go                      |  12 +-
 .../src/proto/gen/rill/runtime/v1/api_pb.ts   |   9 +
 .../src/runtime-client/gen/index.schemas.ts   | 181 ++--
 9 files changed, 596 insertions(+), 512 deletions(-)

diff --git a/proto/gen/rill/runtime/v1/api.pb.go b/proto/gen/rill/runtime/v1/api.pb.go
index ae610a4f438..01028f2faf9 100644
--- a/proto/gen/rill/runtime/v1/api.pb.go
+++ b/proto/gen/rill/runtime/v1/api.pb.go
@@ -4905,6 +4905,9 @@ type IssueDevJWTRequest struct {
 	Email  string   `protobuf:"bytes,2,opt,name=email,proto3" json:"email,omitempty"`
 	Groups []string `protobuf:"bytes,3,rep,name=groups,proto3" json:"groups,omitempty"`
 	Admin  bool     `protobuf:"varint,4,opt,name=admin,proto3" json:"admin,omitempty"`
+	// Additional arbitrary attributes to include in the JWT.
+	// They take precedence if they collide with name, email, groups or admin.
+	Attributes *structpb.Struct `protobuf:"bytes,5,opt,name=attributes,proto3" json:"attributes,omitempty"`
 }
 
 func (x *IssueDevJWTRequest) Reset() {
@@ -4967,6 +4970,13 @@ func (x *IssueDevJWTRequest) GetAdmin() bool {
 	return false
 }
 
+func (x *IssueDevJWTRequest) GetAttributes() *structpb.Struct {
+	if x != nil {
+		return x.Attributes
+	}
+	return nil
+}
+
 // Response message for RuntimeService.IssueDevJWT
 type IssueDevJWTResponse struct {
 	state         protoimpl.MessageState
@@ -6141,370 +6151,373 @@ var file_rill_runtime_v1_api_proto_rawDesc = []byte{
 	0x65, 0x12, 0x3a, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x18,
 	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
 	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x22, 0x7e, 0x0a,
-	0x12, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x12, 0x1d, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42,
-	0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x12,
-	0x16, 0x0a, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x22, 0x27, 0x0a,
-	0x13, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6a, 0x77, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x6a, 0x77, 0x74, 0x22, 0x3a, 0x0a, 0x17, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a,
-	0x65, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x49, 0x64, 0x22, 0x5b, 0x0a, 0x18, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x56, 0x61, 0x72,
-	0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f,
-	0x0a, 0x09, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x21, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x56, 0x61, 0x72, 0x69,
-	0x61, 0x62, 0x6c, 0x65, 0x52, 0x09, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x22,
-	0x83, 0x01, 0x0a, 0x10, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x56, 0x61, 0x72, 0x69,
-	0x61, 0x62, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61,
-	0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x36, 0x0a,
-	0x07, 0x75, 0x73, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d,
+	0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x22, 0xb7, 0x01,
+	0x0a, 0x12, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x12, 0x1d, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c,
+	0x12, 0x16, 0x0a, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x64, 0x6d, 0x69,
+	0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x37,
+	0x0a, 0x0a, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x0a, 0x61, 0x74, 0x74,
+	0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x22, 0x27, 0x0a, 0x13, 0x49, 0x73, 0x73, 0x75, 0x65,
+	0x44, 0x65, 0x76, 0x4a, 0x57, 0x54, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x10,
+	0x0a, 0x03, 0x6a, 0x77, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6a, 0x77, 0x74,
+	0x22, 0x3a, 0x0a, 0x17, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x56, 0x61, 0x72, 0x69, 0x61,
+	0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x69,
+	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x22, 0x5b, 0x0a, 0x18,
+	0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x09, 0x76, 0x61, 0x72, 0x69,
+	0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x72, 0x69,
+	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e,
+	0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x09,
+	0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x22, 0x83, 0x01, 0x0a, 0x10, 0x41, 0x6e,
+	0x61, 0x6c, 0x79, 0x7a, 0x65, 0x64, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x12,
+	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75,
+	0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x36, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x64, 0x5f,
+	0x62, 0x79, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x06, 0x75, 0x73, 0x65, 0x64, 0x42, 0x79, 0x2a,
+	0x54, 0x0a, 0x09, 0x46, 0x69, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x16,
+	0x46, 0x49, 0x4c, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45,
+	0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x46, 0x49, 0x4c, 0x45,
+	0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x10, 0x01, 0x12, 0x15,
+	0x0a, 0x11, 0x46, 0x49, 0x4c, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x44, 0x45, 0x4c,
+	0x45, 0x54, 0x45, 0x10, 0x02, 0x2a, 0x8c, 0x01, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x4c, 0x65, 0x76,
+	0x65, 0x6c, 0x12, 0x19, 0x0a, 0x15, 0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f,
+	0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x13, 0x0a,
+	0x0f, 0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x44, 0x45, 0x42, 0x55, 0x47,
+	0x10, 0x04, 0x12, 0x12, 0x0a, 0x0e, 0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f,
+	0x49, 0x4e, 0x46, 0x4f, 0x10, 0x08, 0x12, 0x12, 0x0a, 0x0e, 0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45,
+	0x56, 0x45, 0x4c, 0x5f, 0x57, 0x41, 0x52, 0x4e, 0x10, 0x0c, 0x12, 0x13, 0x0a, 0x0f, 0x4c, 0x4f,
+	0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x10, 0x12,
+	0x13, 0x0a, 0x0f, 0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x46, 0x41, 0x54,
+	0x41, 0x4c, 0x10, 0x14, 0x2a, 0x64, 0x0a, 0x0d, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x1a, 0x52, 0x45, 0x53, 0x4f, 0x55, 0x52, 0x43,
+	0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46,
+	0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x14, 0x52, 0x45, 0x53, 0x4f, 0x55, 0x52, 0x43,
+	0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x10, 0x01, 0x12,
+	0x19, 0x0a, 0x15, 0x52, 0x45, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e,
+	0x54, 0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x02, 0x32, 0xcd, 0x25, 0x0a, 0x0e, 0x52,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x55, 0x0a,
+	0x04, 0x50, 0x69, 0x6e, 0x67, 0x12, 0x1c, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x10, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0a, 0x12, 0x08, 0x2f, 0x76, 0x31, 0x2f,
+	0x70, 0x69, 0x6e, 0x67, 0x12, 0x5d, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, 0x1e,
 	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
-	0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x06, 0x75,
-	0x73, 0x65, 0x64, 0x42, 0x79, 0x2a, 0x54, 0x0a, 0x09, 0x46, 0x69, 0x6c, 0x65, 0x45, 0x76, 0x65,
-	0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x16, 0x46, 0x49, 0x4c, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54,
-	0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x14,
-	0x0a, 0x10, 0x46, 0x49, 0x4c, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x57, 0x52, 0x49,
-	0x54, 0x45, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11, 0x46, 0x49, 0x4c, 0x45, 0x5f, 0x45, 0x56, 0x45,
-	0x4e, 0x54, 0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x02, 0x2a, 0x8c, 0x01, 0x0a, 0x08,
-	0x4c, 0x6f, 0x67, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x19, 0x0a, 0x15, 0x4c, 0x4f, 0x47, 0x5f,
-	0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45,
-	0x44, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c,
-	0x5f, 0x44, 0x45, 0x42, 0x55, 0x47, 0x10, 0x04, 0x12, 0x12, 0x0a, 0x0e, 0x4c, 0x4f, 0x47, 0x5f,
-	0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0x08, 0x12, 0x12, 0x0a, 0x0e,
-	0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x57, 0x41, 0x52, 0x4e, 0x10, 0x0c,
-	0x12, 0x13, 0x0a, 0x0f, 0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x5f, 0x45, 0x52,
-	0x52, 0x4f, 0x52, 0x10, 0x10, 0x12, 0x13, 0x0a, 0x0f, 0x4c, 0x4f, 0x47, 0x5f, 0x4c, 0x45, 0x56,
-	0x45, 0x4c, 0x5f, 0x46, 0x41, 0x54, 0x41, 0x4c, 0x10, 0x14, 0x2a, 0x64, 0x0a, 0x0d, 0x52, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x1a, 0x52,
-	0x45, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x55, 0x4e,
-	0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x14, 0x52,
-	0x45, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x57, 0x52,
-	0x49, 0x54, 0x45, 0x10, 0x01, 0x12, 0x19, 0x0a, 0x15, 0x52, 0x45, 0x53, 0x4f, 0x55, 0x52, 0x43,
-	0x45, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x02,
-	0x32, 0xcd, 0x25, 0x0a, 0x0e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x12, 0x55, 0x0a, 0x04, 0x50, 0x69, 0x6e, 0x67, 0x12, 0x1c, 0x2e, 0x72, 0x69,
-	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x69,
-	0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
-	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x69, 0x6e, 0x67,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x10, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0a,
-	0x12, 0x08, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x5d, 0x0a, 0x06, 0x48, 0x65,
-	0x61, 0x6c, 0x74, 0x68, 0x12, 0x1e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x12, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0c, 0x12, 0x0a, 0x2f,
-	0x76, 0x31, 0x2f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, 0x8d, 0x01, 0x0a, 0x0e, 0x49, 0x6e,
-	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, 0x26, 0x2e, 0x72,
-	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x49,
-	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x48,
-	0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2a, 0x82,
-	0xd3, 0xe4, 0x93, 0x02, 0x24, 0x12, 0x22, 0x2f, 0x76, 0x31, 0x2f, 0x68, 0x65, 0x61, 0x6c, 0x74,
-	0x68, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x12, 0x75, 0x0a, 0x0d, 0x4c, 0x69, 0x73,
-	0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x25, 0x2e, 0x72, 0x69, 0x6c,
-	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73,
-	0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x15, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x0f, 0x12, 0x0d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73,
-	0x12, 0x7d, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12,
-	0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
-	0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93,
-	0x02, 0x1d, 0x12, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x12,
-	0x7b, 0x0a, 0x0e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x12, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
-	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61,
-	0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x18, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12, 0x3a, 0x01, 0x2a, 0x22, 0x0d, 0x2f,
-	0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x83, 0x01, 0x0a,
-	0x0c, 0x45, 0x64, 0x69, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x24, 0x2e,
+	0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f,
+	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
+	0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x12, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0c, 0x12, 0x0a, 0x2f, 0x76, 0x31, 0x2f, 0x68, 0x65, 0x61,
+	0x6c, 0x74, 0x68, 0x12, 0x8d, 0x01, 0x0a, 0x0e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
+	0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27,
+	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
+	0x2e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x12,
+	0x22, 0x2f, 0x76, 0x31, 0x2f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x2f, 0x69, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f,
+	0x69, 0x64, 0x7d, 0x12, 0x75, 0x0a, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61,
+	0x6e, 0x63, 0x65, 0x73, 0x12, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
+	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61,
+	0x6e, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69,
+	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69,
+	0x73, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x15, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0f, 0x12, 0x0d, 0x2f, 0x76, 0x31,
+	0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x7d, 0x0a, 0x0b, 0x47, 0x65,
+	0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
+	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49,
+	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24,
+	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
+	0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x12, 0x1b, 0x2f, 0x76,
+	0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73,
+	0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x12, 0x7b, 0x0a, 0x0e, 0x43, 0x72, 0x65,
+	0x61, 0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x26, 0x2e, 0x72, 0x69,
+	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x18, 0x82, 0xd3,
+	0xe4, 0x93, 0x02, 0x12, 0x3a, 0x01, 0x2a, 0x22, 0x0d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73,
+	0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x83, 0x01, 0x0a, 0x0c, 0x45, 0x64, 0x69, 0x74, 0x49,
+	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x49, 0x6e,
+	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e,
 	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
-	0x45, 0x64, 0x69, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0x82, 0xd3, 0xe4, 0x93,
-	0x02, 0x20, 0x3a, 0x01, 0x2a, 0x32, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69,
-	0x64, 0x7d, 0x12, 0x89, 0x01, 0x0a, 0x0e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e,
-	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e,
+	0x45, 0x64, 0x69, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x20, 0x3a, 0x01, 0x2a, 0x32,
+	0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b,
+	0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x12, 0x89, 0x01, 0x0a,
+	0x0e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12,
+	0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
+	0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
+	0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x26, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x20, 0x3a, 0x01, 0x2a, 0x22, 0x1b, 0x2f, 0x76, 0x31,
+	0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x12, 0x7d, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74,
+	0x46, 0x69, 0x6c, 0x65, 0x73, 0x12, 0x21, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x65,
+	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x46,
+	0x69, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x29, 0x82, 0xd3,
+	0xe4, 0x93, 0x02, 0x23, 0x12, 0x21, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
+	0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64,
+	0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x12, 0x88, 0x01, 0x0a, 0x0a, 0x57, 0x61, 0x74, 0x63,
+	0x68, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x12, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x46, 0x69,
+	0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x72, 0x69, 0x6c,
+	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74,
+	0x63, 0x68, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x12, 0x27, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73,
+	0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68,
+	0x30, 0x01, 0x12, 0x7d, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x1f, 0x2e,
 	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
-	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x20, 0x3a, 0x01,
-	0x2a, 0x22, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73,
-	0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x12, 0x7d,
-	0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x12, 0x21, 0x2e, 0x72, 0x69,
-	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69,
-	0x73, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22,
+	0x47, 0x65, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20,
 	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
-	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x12, 0x21, 0x2f, 0x76, 0x31, 0x2f,
-	0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x12, 0x88, 0x01,
-	0x0a, 0x0a, 0x57, 0x61, 0x74, 0x63, 0x68, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x12, 0x22, 0x2e, 0x72,
-	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57,
-	0x61, 0x74, 0x63, 0x68, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x2e, 0x47, 0x65, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x12, 0x27, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e,
+	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
+	0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x65, 0x6e, 0x74, 0x72,
+	0x79, 0x12, 0x80, 0x01, 0x0a, 0x07, 0x50, 0x75, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x1f, 0x2e,
+	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
+	0x50, 0x75, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20,
+	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
+	0x2e, 0x50, 0x75, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x32, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2c, 0x3a, 0x01, 0x2a, 0x22, 0x27, 0x2f, 0x76, 0x31,
+	0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x65,
+	0x6e, 0x74, 0x72, 0x79, 0x12, 0x96, 0x01, 0x0a, 0x0f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44,
+	0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74,
+	0x65, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x28, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x30, 0x82, 0xd3, 0xe4,
+	0x93, 0x02, 0x2a, 0x3a, 0x01, 0x2a, 0x22, 0x25, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f,
+	0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x64, 0x69, 0x72, 0x12, 0x86, 0x01,
+	0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x22, 0x2e, 0x72,
+	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44,
+	0x65, 0x6c, 0x65, 0x74, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
 	0x1a, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
-	0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x12, 0x27, 0x2f,
+	0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x2a, 0x27, 0x2f,
 	0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e,
 	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73,
-	0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x30, 0x01, 0x12, 0x7d, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x46,
-	0x69, 0x6c, 0x65, 0x12, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x12, 0x27,
-	0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69,
-	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65,
-	0x73, 0x2f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x80, 0x01, 0x0a, 0x07, 0x50, 0x75, 0x74, 0x46,
-	0x69, 0x6c, 0x65, 0x12, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x75, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x75, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x32, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2c, 0x3a, 0x01,
-	0x2a, 0x22, 0x27, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73,
-	0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66,
-	0x69, 0x6c, 0x65, 0x73, 0x2f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x96, 0x01, 0x0a, 0x0f, 0x43,
-	0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x27,
-	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
-	0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
-	0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x30, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2a, 0x3a, 0x01, 0x2a, 0x22, 0x25, 0x2f, 0x76,
-	0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f,
-	0x64, 0x69, 0x72, 0x12, 0x86, 0x01, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x46, 0x69,
-	0x6c, 0x65, 0x12, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
-	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x46,
-	0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4,
-	0x93, 0x02, 0x29, 0x2a, 0x27, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d,
-	0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x8a, 0x01, 0x0a,
-	0x0a, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x22, 0x2e, 0x72, 0x69,
-	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65,
-	0x6e, 0x61, 0x6d, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
-	0x31, 0x2e, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x33, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2d, 0x3a, 0x01, 0x2a, 0x22,
-	0x28, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b,
-	0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c,
-	0x65, 0x73, 0x2f, 0x72, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x71, 0x0a, 0x0c, 0x4c, 0x69, 0x73,
-	0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x12, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
+	0x2f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x8a, 0x01, 0x0a, 0x0a, 0x52, 0x65, 0x6e, 0x61, 0x6d,
+	0x65, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x46, 0x69,
+	0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
+	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x6e, 0x61,
+	0x6d, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x33,
+	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2d, 0x3a, 0x01, 0x2a, 0x22, 0x28, 0x2f, 0x76, 0x31, 0x2f, 0x69,
+	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
+	0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x72, 0x65, 0x6e,
+	0x61, 0x6d, 0x65, 0x12, 0x71, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70,
+	0x6c, 0x65, 0x73, 0x12, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c,
+	0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
 	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74,
-	0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
-	0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x14, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0e, 0x12, 0x0c,
-	0x2f, 0x76, 0x31, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x12, 0x9b, 0x01, 0x0a,
-	0x0d, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x25,
-	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
-	0x2e, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x78,
-	0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x3b, 0x82,
-	0xd3, 0xe4, 0x93, 0x02, 0x35, 0x3a, 0x01, 0x2a, 0x22, 0x30, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e,
-	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x75, 0x6e, 0x70, 0x61,
-	0x63, 0x6b, 0x2d, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x93, 0x01, 0x0a, 0x0b, 0x55,
-	0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x23, 0x2e, 0x72, 0x69, 0x6c,
-	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x70,
-	0x61, 0x63, 0x6b, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
-	0x31, 0x2e, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x39, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x33, 0x3a, 0x01, 0x2a,
-	0x22, 0x2e, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f,
-	0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69,
-	0x6c, 0x65, 0x73, 0x2f, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x2d, 0x65, 0x6d, 0x70, 0x74, 0x79,
-	0x12, 0xc0, 0x01, 0x0a, 0x17, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x74,
-	0x72, 0x69, 0x63, 0x73, 0x56, 0x69, 0x65, 0x77, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x2f, 0x2e, 0x72,
-	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47,
-	0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x56, 0x69,
-	0x65, 0x77, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x30, 0x2e,
-	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
-	0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x56,
-	0x69, 0x65, 0x77, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x42, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x3c, 0x3a, 0x01, 0x2a, 0x22, 0x37, 0x2f, 0x76, 0x31, 0x2f,
+	0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x14, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0e, 0x12, 0x0c, 0x2f, 0x76, 0x31, 0x2f, 0x65, 0x78,
+	0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x12, 0x9b, 0x01, 0x0a, 0x0d, 0x55, 0x6e, 0x70, 0x61, 0x63,
+	0x6b, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x70, 0x61, 0x63,
+	0x6b, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
+	0x31, 0x2e, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x3b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x35, 0x3a,
+	0x01, 0x2a, 0x22, 0x30, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f,
+	0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x2d, 0x65, 0x78, 0x61,
+	0x6d, 0x70, 0x6c, 0x65, 0x12, 0x93, 0x01, 0x0a, 0x0b, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45,
+	0x6d, 0x70, 0x74, 0x79, 0x12, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
+	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x6d, 0x70,
+	0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
+	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x70, 0x61,
+	0x63, 0x6b, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x39, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x33, 0x3a, 0x01, 0x2a, 0x22, 0x2e, 0x2f, 0x76, 0x31, 0x2f,
 	0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x67, 0x65,
-	0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x2d, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x2d, 0x76,
-	0x69, 0x65, 0x77, 0x12, 0xa1, 0x01, 0x0a, 0x10, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65,
-	0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x12, 0x28, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
-	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72,
-	0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x75, 0x6e,
+	0x70, 0x61, 0x63, 0x6b, 0x2d, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x12, 0xc0, 0x01, 0x0a, 0x17, 0x47,
+	0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x56, 0x69,
+	0x65, 0x77, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x2f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74,
+	0x65, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x56, 0x69, 0x65, 0x77, 0x46, 0x69, 0x6c, 0x65,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x30, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61,
+	0x74, 0x65, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x56, 0x69, 0x65, 0x77, 0x46, 0x69, 0x6c,
+	0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x42, 0x82, 0xd3, 0xe4, 0x93, 0x02,
+	0x3c, 0x3a, 0x01, 0x2a, 0x22, 0x37, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
+	0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64,
+	0x7d, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65,
+	0x2d, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x2d, 0x76, 0x69, 0x65, 0x77, 0x12, 0xa1, 0x01,
+	0x0a, 0x10, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76,
+	0x65, 0x72, 0x12, 0x28, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
 	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73,
-	0x6f, 0x6c, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x38, 0x82,
-	0xd3, 0xe4, 0x93, 0x02, 0x32, 0x3a, 0x01, 0x2a, 0x22, 0x2d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e,
-	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x2f, 0x72,
-	0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x12, 0xa1, 0x01, 0x0a, 0x10, 0x47, 0x65, 0x6e, 0x65,
-	0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x12, 0x28, 0x2e, 0x72,
+	0x6f, 0x6c, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x72,
 	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47,
-	0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
+	0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x38, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x32, 0x3a,
+	0x01, 0x2a, 0x22, 0x2d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f,
+	0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65,
+	0x72, 0x12, 0xa1, 0x01, 0x0a, 0x10, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65,
+	0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x12, 0x28, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
 	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74,
-	0x65, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x38, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x32, 0x3a, 0x01, 0x2a, 0x22, 0x2d, 0x2f, 0x76,
-	0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61,
-	0x74, 0x65, 0x2f, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x12, 0x76, 0x0a, 0x07, 0x47,
-	0x65, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67, 0x73,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67,
-	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x28, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x22, 0x12, 0x20, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73,
-	0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6c,
-	0x6f, 0x67, 0x73, 0x12, 0x84, 0x01, 0x0a, 0x09, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x6f, 0x67,
-	0x73, 0x12, 0x21, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x6f, 0x67, 0x73,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x28,
-	0x12, 0x26, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f,
-	0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6c, 0x6f,
-	0x67, 0x73, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x30, 0x01, 0x12, 0x8d, 0x01, 0x0a, 0x0d, 0x4c,
-	0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x25, 0x2e, 0x72,
-	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c,
-	0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2d, 0x82, 0xd3, 0xe4,
-	0x93, 0x02, 0x27, 0x12, 0x25, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d,
-	0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x9a, 0x01, 0x0a, 0x0e, 0x57,
-	0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x26, 0x2e,
-	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
-	0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x35,
-	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2f, 0x12, 0x2d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74,
+	0x65, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+	0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x6e, 0x64, 0x65,
+	0x72, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x38, 0x82, 0xd3, 0xe4,
+	0x93, 0x02, 0x32, 0x3a, 0x01, 0x2a, 0x22, 0x2d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74,
 	0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f,
-	0x69, 0x64, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x2d, 0x2f,
-	0x77, 0x61, 0x74, 0x63, 0x68, 0x30, 0x01, 0x12, 0x86, 0x01, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x52,
-	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x72,
-	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47,
-	0x65, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26, 0x12, 0x24, 0x2f, 0x76, 0x31, 0x2f,
+	0x69, 0x64, 0x7d, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x2f, 0x72, 0x65, 0x6e,
+	0x64, 0x65, 0x72, 0x65, 0x72, 0x12, 0x76, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67, 0x73,
+	0x12, 0x1f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x20, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x28, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x12, 0x20, 0x2f, 0x76, 0x31,
+	0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6c, 0x6f, 0x67, 0x73, 0x12, 0x84, 0x01,
+	0x0a, 0x09, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x21, 0x2e, 0x72, 0x69,
+	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61,
+	0x74, 0x63, 0x68, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22,
+	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
+	0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x2e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x28, 0x12, 0x26, 0x2f, 0x76, 0x31, 0x2f,
 	0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x12, 0x8c, 0x01, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x12,
-	0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
-	0x31, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65,
+	0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6c, 0x6f, 0x67, 0x73, 0x2f, 0x77, 0x61, 0x74,
+	0x63, 0x68, 0x30, 0x01, 0x12, 0x8d, 0x01, 0x0a, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e,
+	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
+	0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x27, 0x12, 0x25, 0x2f,
+	0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e,
+	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x73, 0x12, 0x9a, 0x01, 0x0a, 0x0e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x27, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76,
+	0x31, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
 	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x35, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2f,
 	0x12, 0x2d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f,
 	0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x72, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x65, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x12,
-	0xac, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61, 0x72, 0x74,
-	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2a, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65,
-	0x6c, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
-	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61, 0x72,
-	0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x3d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x37, 0x12, 0x35, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x7b, 0x6d, 0x6f, 0x64,
-	0x65, 0x6c, 0x7d, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x8e,
-	0x01, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
-	0x12, 0x25, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
-	0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
-	0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x2e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x28, 0x3a, 0x01, 0x2a, 0x22, 0x23, 0x2f, 0x76, 0x31, 0x2f,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x2d, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x30,
+	0x01, 0x12, 0x86, 0x01, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x12, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x82, 0xd3,
+	0xe4, 0x93, 0x02, 0x26, 0x12, 0x24, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
+	0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64,
+	0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x8c, 0x01, 0x0a, 0x0a, 0x47,
+	0x65, 0x74, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x12, 0x22, 0x2e, 0x72, 0x69, 0x6c, 0x6c,
+	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x45,
+	0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e,
+	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
+	0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x35, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2f, 0x12, 0x2d, 0x2f, 0x76, 0x31, 0x2f,
 	0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x12,
-	0x90, 0x01, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x12, 0x2c, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
-	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f,
-	0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x2f, 0x6d, 0x65,
-	0x74, 0x61, 0x12, 0xa2, 0x01, 0x0a, 0x11, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x43, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
-	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79,
-	0x7a, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x43, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x36, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x30, 0x12, 0x2e, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x2f,
-	0x61, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x12, 0xb3, 0x01, 0x0a, 0x16, 0x4c, 0x69, 0x73, 0x74,
-	0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0x73, 0x12, 0x2e, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
-	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65,
-	0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
-	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65,
-	0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x38, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x32, 0x12, 0x30, 0x2f, 0x76, 0x31,
-	0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74,
-	0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x6f, 0x72, 0x73, 0x2f, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x12, 0x70, 0x0a,
-	0x0b, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54, 0x12, 0x23, 0x2e, 0x72,
-	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x49,
-	0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x24, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x2e, 0x76, 0x31, 0x2e, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x16, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x10, 0x3a,
-	0x01, 0x2a, 0x22, 0x0b, 0x2f, 0x76, 0x31, 0x2f, 0x64, 0x65, 0x76, 0x2d, 0x6a, 0x77, 0x74, 0x12,
-	0x9e, 0x01, 0x0a, 0x10, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x56, 0x61, 0x72, 0x69, 0x61,
-	0x62, 0x6c, 0x65, 0x73, 0x12, 0x28, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x56, 0x61,
-	0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29,
+	0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x73, 0x2f, 0x65, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x12, 0xac, 0x01, 0x0a, 0x12, 0x47, 0x65,
+	0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x12, 0x2a, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61, 0x72, 0x74, 0x69,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x72,
+	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47,
+	0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x3d, 0x82, 0xd3, 0xe4, 0x93, 0x02,
+	0x37, 0x12, 0x35, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73,
+	0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6d,
+	0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x7b, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x7d, 0x2f, 0x70, 0x61,
+	0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x8e, 0x01, 0x0a, 0x0d, 0x43, 0x72, 0x65,
+	0x61, 0x74, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x12, 0x25, 0x2e, 0x72, 0x69, 0x6c,
+	0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65,
+	0x61, 0x74, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x26, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65,
+	0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2e, 0x82, 0xd3, 0xe4, 0x93, 0x02,
+	0x28, 0x3a, 0x01, 0x2a, 0x22, 0x23, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
+	0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64,
+	0x7d, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x12, 0x90, 0x01, 0x0a, 0x14, 0x4c, 0x69,
+	0x73, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65,
+	0x72, 0x73, 0x12, 0x2c, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x2d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+	0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
+	0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x1b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x12, 0xa2, 0x01, 0x0a,
+	0x11, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f,
+	0x72, 0x73, 0x12, 0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x43, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e,
+	0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e,
+	0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
+	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x36, 0x82, 0xd3, 0xe4, 0x93, 0x02,
+	0x30, 0x12, 0x2e, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73,
+	0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x63,
+	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x2f, 0x61, 0x6e, 0x61, 0x6c, 0x79, 0x7a,
+	0x65, 0x12, 0xb3, 0x01, 0x0a, 0x16, 0x4c, 0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69,
+	0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x2e, 0x2e, 0x72,
+	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c,
+	0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x72,
+	0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c,
+	0x69, 0x73, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x6f, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x38, 0x82,
+	0xd3, 0xe4, 0x93, 0x02, 0x32, 0x12, 0x30, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61,
+	0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69,
+	0x64, 0x7d, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x2f, 0x6e, 0x6f,
+	0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x12, 0x70, 0x0a, 0x0b, 0x49, 0x73, 0x73, 0x75, 0x65,
+	0x44, 0x65, 0x76, 0x4a, 0x57, 0x54, 0x12, 0x23, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x73, 0x73, 0x75, 0x65, 0x44, 0x65,
+	0x76, 0x4a, 0x57, 0x54, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x72, 0x69,
+	0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x73,
+	0x73, 0x75, 0x65, 0x44, 0x65, 0x76, 0x4a, 0x57, 0x54, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x16, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x10, 0x3a, 0x01, 0x2a, 0x22, 0x0b, 0x2f, 0x76,
+	0x31, 0x2f, 0x64, 0x65, 0x76, 0x2d, 0x6a, 0x77, 0x74, 0x12, 0x9e, 0x01, 0x0a, 0x10, 0x41, 0x6e,
+	0x61, 0x6c, 0x79, 0x7a, 0x65, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x28,
 	0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31,
 	0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65,
-	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x35, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x2f, 0x12, 0x2d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73,
-	0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x76,
-	0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x2f, 0x61, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65,
-	0x42, 0xbb, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x08, 0x41, 0x70, 0x69, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x72, 0x69, 0x6c, 0x6c, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x72, 0x69, 0x6c, 0x6c, 0x2f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x72, 0x69, 0x6c, 0x6c, 0x2f, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x76, 0x31, 0xa2, 0x02, 0x03, 0x52, 0x52, 0x58, 0xaa, 0x02, 0x0f, 0x52, 0x69, 0x6c, 0x6c, 0x2e,
-	0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0f, 0x52, 0x69, 0x6c,
-	0x6c, 0x5c, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1b, 0x52,
-	0x69, 0x6c, 0x6c, 0x5c, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47,
-	0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x11, 0x52, 0x69, 0x6c,
-	0x6c, 0x3a, 0x3a, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79,
+	0x7a, 0x65, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x35, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2f, 0x12, 0x2d, 0x2f, 0x76, 0x31,
+	0x2f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c,
+	0x65, 0x73, 0x2f, 0x61, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x42, 0xbb, 0x01, 0x0a, 0x13, 0x63,
+	0x6f, 0x6d, 0x2e, 0x72, 0x69, 0x6c, 0x6c, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+	0x76, 0x31, 0x42, 0x08, 0x41, 0x70, 0x69, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c,
+	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, 0x69, 0x6c, 0x6c, 0x64,
+	0x61, 0x74, 0x61, 0x2f, 0x72, 0x69, 0x6c, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67,
+	0x65, 0x6e, 0x2f, 0x72, 0x69, 0x6c, 0x6c, 0x2f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f,
+	0x76, 0x31, 0x3b, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x52,
+	0x52, 0x58, 0xaa, 0x02, 0x0f, 0x52, 0x69, 0x6c, 0x6c, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0f, 0x52, 0x69, 0x6c, 0x6c, 0x5c, 0x52, 0x75, 0x6e, 0x74,
+	0x69, 0x6d, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1b, 0x52, 0x69, 0x6c, 0x6c, 0x5c, 0x52, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61,
+	0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x11, 0x52, 0x69, 0x6c, 0x6c, 0x3a, 0x3a, 0x52, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -6692,83 +6705,84 @@ var file_rill_runtime_v1_api_proto_depIdxs = []int32{
 	69,  // 61: rill.runtime.v1.ListConnectorDriversResponse.connectors:type_name -> rill.runtime.v1.ConnectorDriver
 	70,  // 62: rill.runtime.v1.AnalyzeConnectorsResponse.connectors:type_name -> rill.runtime.v1.AnalyzedConnector
 	12,  // 63: rill.runtime.v1.ListNotifierConnectorsResponse.connectors:type_name -> rill.runtime.v1.Connector
-	81,  // 64: rill.runtime.v1.AnalyzeVariablesResponse.variables:type_name -> rill.runtime.v1.AnalyzedVariable
-	102, // 65: rill.runtime.v1.AnalyzedVariable.used_by:type_name -> rill.runtime.v1.ResourceName
-	10,  // 66: rill.runtime.v1.HealthResponse.InstancesHealthEntry.value:type_name -> rill.runtime.v1.InstanceHealth
-	3,   // 67: rill.runtime.v1.ConnectorDriver.Property.type:type_name -> rill.runtime.v1.ConnectorDriver.Property.Type
-	4,   // 68: rill.runtime.v1.RuntimeService.Ping:input_type -> rill.runtime.v1.PingRequest
-	6,   // 69: rill.runtime.v1.RuntimeService.Health:input_type -> rill.runtime.v1.HealthRequest
-	8,   // 70: rill.runtime.v1.RuntimeService.InstanceHealth:input_type -> rill.runtime.v1.InstanceHealthRequest
-	13,  // 71: rill.runtime.v1.RuntimeService.ListInstances:input_type -> rill.runtime.v1.ListInstancesRequest
-	15,  // 72: rill.runtime.v1.RuntimeService.GetInstance:input_type -> rill.runtime.v1.GetInstanceRequest
-	17,  // 73: rill.runtime.v1.RuntimeService.CreateInstance:input_type -> rill.runtime.v1.CreateInstanceRequest
-	21,  // 74: rill.runtime.v1.RuntimeService.EditInstance:input_type -> rill.runtime.v1.EditInstanceRequest
-	19,  // 75: rill.runtime.v1.RuntimeService.DeleteInstance:input_type -> rill.runtime.v1.DeleteInstanceRequest
-	23,  // 76: rill.runtime.v1.RuntimeService.ListFiles:input_type -> rill.runtime.v1.ListFilesRequest
-	26,  // 77: rill.runtime.v1.RuntimeService.WatchFiles:input_type -> rill.runtime.v1.WatchFilesRequest
-	28,  // 78: rill.runtime.v1.RuntimeService.GetFile:input_type -> rill.runtime.v1.GetFileRequest
-	30,  // 79: rill.runtime.v1.RuntimeService.PutFile:input_type -> rill.runtime.v1.PutFileRequest
-	32,  // 80: rill.runtime.v1.RuntimeService.CreateDirectory:input_type -> rill.runtime.v1.CreateDirectoryRequest
-	34,  // 81: rill.runtime.v1.RuntimeService.DeleteFile:input_type -> rill.runtime.v1.DeleteFileRequest
-	36,  // 82: rill.runtime.v1.RuntimeService.RenameFile:input_type -> rill.runtime.v1.RenameFileRequest
-	39,  // 83: rill.runtime.v1.RuntimeService.ListExamples:input_type -> rill.runtime.v1.ListExamplesRequest
-	41,  // 84: rill.runtime.v1.RuntimeService.UnpackExample:input_type -> rill.runtime.v1.UnpackExampleRequest
-	43,  // 85: rill.runtime.v1.RuntimeService.UnpackEmpty:input_type -> rill.runtime.v1.UnpackEmptyRequest
-	45,  // 86: rill.runtime.v1.RuntimeService.GenerateMetricsViewFile:input_type -> rill.runtime.v1.GenerateMetricsViewFileRequest
-	47,  // 87: rill.runtime.v1.RuntimeService.GenerateResolver:input_type -> rill.runtime.v1.GenerateResolverRequest
-	49,  // 88: rill.runtime.v1.RuntimeService.GenerateRenderer:input_type -> rill.runtime.v1.GenerateRendererRequest
-	53,  // 89: rill.runtime.v1.RuntimeService.GetLogs:input_type -> rill.runtime.v1.GetLogsRequest
-	55,  // 90: rill.runtime.v1.RuntimeService.WatchLogs:input_type -> rill.runtime.v1.WatchLogsRequest
-	57,  // 91: rill.runtime.v1.RuntimeService.ListResources:input_type -> rill.runtime.v1.ListResourcesRequest
-	59,  // 92: rill.runtime.v1.RuntimeService.WatchResources:input_type -> rill.runtime.v1.WatchResourcesRequest
-	61,  // 93: rill.runtime.v1.RuntimeService.GetResource:input_type -> rill.runtime.v1.GetResourceRequest
-	63,  // 94: rill.runtime.v1.RuntimeService.GetExplore:input_type -> rill.runtime.v1.GetExploreRequest
-	65,  // 95: rill.runtime.v1.RuntimeService.GetModelPartitions:input_type -> rill.runtime.v1.GetModelPartitionsRequest
-	67,  // 96: rill.runtime.v1.RuntimeService.CreateTrigger:input_type -> rill.runtime.v1.CreateTriggerRequest
-	71,  // 97: rill.runtime.v1.RuntimeService.ListConnectorDrivers:input_type -> rill.runtime.v1.ListConnectorDriversRequest
-	73,  // 98: rill.runtime.v1.RuntimeService.AnalyzeConnectors:input_type -> rill.runtime.v1.AnalyzeConnectorsRequest
-	75,  // 99: rill.runtime.v1.RuntimeService.ListNotifierConnectors:input_type -> rill.runtime.v1.ListNotifierConnectorsRequest
-	77,  // 100: rill.runtime.v1.RuntimeService.IssueDevJWT:input_type -> rill.runtime.v1.IssueDevJWTRequest
-	79,  // 101: rill.runtime.v1.RuntimeService.AnalyzeVariables:input_type -> rill.runtime.v1.AnalyzeVariablesRequest
-	5,   // 102: rill.runtime.v1.RuntimeService.Ping:output_type -> rill.runtime.v1.PingResponse
-	7,   // 103: rill.runtime.v1.RuntimeService.Health:output_type -> rill.runtime.v1.HealthResponse
-	9,   // 104: rill.runtime.v1.RuntimeService.InstanceHealth:output_type -> rill.runtime.v1.InstanceHealthResponse
-	14,  // 105: rill.runtime.v1.RuntimeService.ListInstances:output_type -> rill.runtime.v1.ListInstancesResponse
-	16,  // 106: rill.runtime.v1.RuntimeService.GetInstance:output_type -> rill.runtime.v1.GetInstanceResponse
-	18,  // 107: rill.runtime.v1.RuntimeService.CreateInstance:output_type -> rill.runtime.v1.CreateInstanceResponse
-	22,  // 108: rill.runtime.v1.RuntimeService.EditInstance:output_type -> rill.runtime.v1.EditInstanceResponse
-	20,  // 109: rill.runtime.v1.RuntimeService.DeleteInstance:output_type -> rill.runtime.v1.DeleteInstanceResponse
-	24,  // 110: rill.runtime.v1.RuntimeService.ListFiles:output_type -> rill.runtime.v1.ListFilesResponse
-	27,  // 111: rill.runtime.v1.RuntimeService.WatchFiles:output_type -> rill.runtime.v1.WatchFilesResponse
-	29,  // 112: rill.runtime.v1.RuntimeService.GetFile:output_type -> rill.runtime.v1.GetFileResponse
-	31,  // 113: rill.runtime.v1.RuntimeService.PutFile:output_type -> rill.runtime.v1.PutFileResponse
-	33,  // 114: rill.runtime.v1.RuntimeService.CreateDirectory:output_type -> rill.runtime.v1.CreateDirectoryResponse
-	35,  // 115: rill.runtime.v1.RuntimeService.DeleteFile:output_type -> rill.runtime.v1.DeleteFileResponse
-	37,  // 116: rill.runtime.v1.RuntimeService.RenameFile:output_type -> rill.runtime.v1.RenameFileResponse
-	40,  // 117: rill.runtime.v1.RuntimeService.ListExamples:output_type -> rill.runtime.v1.ListExamplesResponse
-	42,  // 118: rill.runtime.v1.RuntimeService.UnpackExample:output_type -> rill.runtime.v1.UnpackExampleResponse
-	44,  // 119: rill.runtime.v1.RuntimeService.UnpackEmpty:output_type -> rill.runtime.v1.UnpackEmptyResponse
-	46,  // 120: rill.runtime.v1.RuntimeService.GenerateMetricsViewFile:output_type -> rill.runtime.v1.GenerateMetricsViewFileResponse
-	48,  // 121: rill.runtime.v1.RuntimeService.GenerateResolver:output_type -> rill.runtime.v1.GenerateResolverResponse
-	50,  // 122: rill.runtime.v1.RuntimeService.GenerateRenderer:output_type -> rill.runtime.v1.GenerateRendererResponse
-	54,  // 123: rill.runtime.v1.RuntimeService.GetLogs:output_type -> rill.runtime.v1.GetLogsResponse
-	56,  // 124: rill.runtime.v1.RuntimeService.WatchLogs:output_type -> rill.runtime.v1.WatchLogsResponse
-	58,  // 125: rill.runtime.v1.RuntimeService.ListResources:output_type -> rill.runtime.v1.ListResourcesResponse
-	60,  // 126: rill.runtime.v1.RuntimeService.WatchResources:output_type -> rill.runtime.v1.WatchResourcesResponse
-	62,  // 127: rill.runtime.v1.RuntimeService.GetResource:output_type -> rill.runtime.v1.GetResourceResponse
-	64,  // 128: rill.runtime.v1.RuntimeService.GetExplore:output_type -> rill.runtime.v1.GetExploreResponse
-	66,  // 129: rill.runtime.v1.RuntimeService.GetModelPartitions:output_type -> rill.runtime.v1.GetModelPartitionsResponse
-	68,  // 130: rill.runtime.v1.RuntimeService.CreateTrigger:output_type -> rill.runtime.v1.CreateTriggerResponse
-	72,  // 131: rill.runtime.v1.RuntimeService.ListConnectorDrivers:output_type -> rill.runtime.v1.ListConnectorDriversResponse
-	74,  // 132: rill.runtime.v1.RuntimeService.AnalyzeConnectors:output_type -> rill.runtime.v1.AnalyzeConnectorsResponse
-	76,  // 133: rill.runtime.v1.RuntimeService.ListNotifierConnectors:output_type -> rill.runtime.v1.ListNotifierConnectorsResponse
-	78,  // 134: rill.runtime.v1.RuntimeService.IssueDevJWT:output_type -> rill.runtime.v1.IssueDevJWTResponse
-	80,  // 135: rill.runtime.v1.RuntimeService.AnalyzeVariables:output_type -> rill.runtime.v1.AnalyzeVariablesResponse
-	102, // [102:136] is the sub-list for method output_type
-	68,  // [68:102] is the sub-list for method input_type
-	68,  // [68:68] is the sub-list for extension type_name
-	68,  // [68:68] is the sub-list for extension extendee
-	0,   // [0:68] is the sub-list for field type_name
+	100, // 64: rill.runtime.v1.IssueDevJWTRequest.attributes:type_name -> google.protobuf.Struct
+	81,  // 65: rill.runtime.v1.AnalyzeVariablesResponse.variables:type_name -> rill.runtime.v1.AnalyzedVariable
+	102, // 66: rill.runtime.v1.AnalyzedVariable.used_by:type_name -> rill.runtime.v1.ResourceName
+	10,  // 67: rill.runtime.v1.HealthResponse.InstancesHealthEntry.value:type_name -> rill.runtime.v1.InstanceHealth
+	3,   // 68: rill.runtime.v1.ConnectorDriver.Property.type:type_name -> rill.runtime.v1.ConnectorDriver.Property.Type
+	4,   // 69: rill.runtime.v1.RuntimeService.Ping:input_type -> rill.runtime.v1.PingRequest
+	6,   // 70: rill.runtime.v1.RuntimeService.Health:input_type -> rill.runtime.v1.HealthRequest
+	8,   // 71: rill.runtime.v1.RuntimeService.InstanceHealth:input_type -> rill.runtime.v1.InstanceHealthRequest
+	13,  // 72: rill.runtime.v1.RuntimeService.ListInstances:input_type -> rill.runtime.v1.ListInstancesRequest
+	15,  // 73: rill.runtime.v1.RuntimeService.GetInstance:input_type -> rill.runtime.v1.GetInstanceRequest
+	17,  // 74: rill.runtime.v1.RuntimeService.CreateInstance:input_type -> rill.runtime.v1.CreateInstanceRequest
+	21,  // 75: rill.runtime.v1.RuntimeService.EditInstance:input_type -> rill.runtime.v1.EditInstanceRequest
+	19,  // 76: rill.runtime.v1.RuntimeService.DeleteInstance:input_type -> rill.runtime.v1.DeleteInstanceRequest
+	23,  // 77: rill.runtime.v1.RuntimeService.ListFiles:input_type -> rill.runtime.v1.ListFilesRequest
+	26,  // 78: rill.runtime.v1.RuntimeService.WatchFiles:input_type -> rill.runtime.v1.WatchFilesRequest
+	28,  // 79: rill.runtime.v1.RuntimeService.GetFile:input_type -> rill.runtime.v1.GetFileRequest
+	30,  // 80: rill.runtime.v1.RuntimeService.PutFile:input_type -> rill.runtime.v1.PutFileRequest
+	32,  // 81: rill.runtime.v1.RuntimeService.CreateDirectory:input_type -> rill.runtime.v1.CreateDirectoryRequest
+	34,  // 82: rill.runtime.v1.RuntimeService.DeleteFile:input_type -> rill.runtime.v1.DeleteFileRequest
+	36,  // 83: rill.runtime.v1.RuntimeService.RenameFile:input_type -> rill.runtime.v1.RenameFileRequest
+	39,  // 84: rill.runtime.v1.RuntimeService.ListExamples:input_type -> rill.runtime.v1.ListExamplesRequest
+	41,  // 85: rill.runtime.v1.RuntimeService.UnpackExample:input_type -> rill.runtime.v1.UnpackExampleRequest
+	43,  // 86: rill.runtime.v1.RuntimeService.UnpackEmpty:input_type -> rill.runtime.v1.UnpackEmptyRequest
+	45,  // 87: rill.runtime.v1.RuntimeService.GenerateMetricsViewFile:input_type -> rill.runtime.v1.GenerateMetricsViewFileRequest
+	47,  // 88: rill.runtime.v1.RuntimeService.GenerateResolver:input_type -> rill.runtime.v1.GenerateResolverRequest
+	49,  // 89: rill.runtime.v1.RuntimeService.GenerateRenderer:input_type -> rill.runtime.v1.GenerateRendererRequest
+	53,  // 90: rill.runtime.v1.RuntimeService.GetLogs:input_type -> rill.runtime.v1.GetLogsRequest
+	55,  // 91: rill.runtime.v1.RuntimeService.WatchLogs:input_type -> rill.runtime.v1.WatchLogsRequest
+	57,  // 92: rill.runtime.v1.RuntimeService.ListResources:input_type -> rill.runtime.v1.ListResourcesRequest
+	59,  // 93: rill.runtime.v1.RuntimeService.WatchResources:input_type -> rill.runtime.v1.WatchResourcesRequest
+	61,  // 94: rill.runtime.v1.RuntimeService.GetResource:input_type -> rill.runtime.v1.GetResourceRequest
+	63,  // 95: rill.runtime.v1.RuntimeService.GetExplore:input_type -> rill.runtime.v1.GetExploreRequest
+	65,  // 96: rill.runtime.v1.RuntimeService.GetModelPartitions:input_type -> rill.runtime.v1.GetModelPartitionsRequest
+	67,  // 97: rill.runtime.v1.RuntimeService.CreateTrigger:input_type -> rill.runtime.v1.CreateTriggerRequest
+	71,  // 98: rill.runtime.v1.RuntimeService.ListConnectorDrivers:input_type -> rill.runtime.v1.ListConnectorDriversRequest
+	73,  // 99: rill.runtime.v1.RuntimeService.AnalyzeConnectors:input_type -> rill.runtime.v1.AnalyzeConnectorsRequest
+	75,  // 100: rill.runtime.v1.RuntimeService.ListNotifierConnectors:input_type -> rill.runtime.v1.ListNotifierConnectorsRequest
+	77,  // 101: rill.runtime.v1.RuntimeService.IssueDevJWT:input_type -> rill.runtime.v1.IssueDevJWTRequest
+	79,  // 102: rill.runtime.v1.RuntimeService.AnalyzeVariables:input_type -> rill.runtime.v1.AnalyzeVariablesRequest
+	5,   // 103: rill.runtime.v1.RuntimeService.Ping:output_type -> rill.runtime.v1.PingResponse
+	7,   // 104: rill.runtime.v1.RuntimeService.Health:output_type -> rill.runtime.v1.HealthResponse
+	9,   // 105: rill.runtime.v1.RuntimeService.InstanceHealth:output_type -> rill.runtime.v1.InstanceHealthResponse
+	14,  // 106: rill.runtime.v1.RuntimeService.ListInstances:output_type -> rill.runtime.v1.ListInstancesResponse
+	16,  // 107: rill.runtime.v1.RuntimeService.GetInstance:output_type -> rill.runtime.v1.GetInstanceResponse
+	18,  // 108: rill.runtime.v1.RuntimeService.CreateInstance:output_type -> rill.runtime.v1.CreateInstanceResponse
+	22,  // 109: rill.runtime.v1.RuntimeService.EditInstance:output_type -> rill.runtime.v1.EditInstanceResponse
+	20,  // 110: rill.runtime.v1.RuntimeService.DeleteInstance:output_type -> rill.runtime.v1.DeleteInstanceResponse
+	24,  // 111: rill.runtime.v1.RuntimeService.ListFiles:output_type -> rill.runtime.v1.ListFilesResponse
+	27,  // 112: rill.runtime.v1.RuntimeService.WatchFiles:output_type -> rill.runtime.v1.WatchFilesResponse
+	29,  // 113: rill.runtime.v1.RuntimeService.GetFile:output_type -> rill.runtime.v1.GetFileResponse
+	31,  // 114: rill.runtime.v1.RuntimeService.PutFile:output_type -> rill.runtime.v1.PutFileResponse
+	33,  // 115: rill.runtime.v1.RuntimeService.CreateDirectory:output_type -> rill.runtime.v1.CreateDirectoryResponse
+	35,  // 116: rill.runtime.v1.RuntimeService.DeleteFile:output_type -> rill.runtime.v1.DeleteFileResponse
+	37,  // 117: rill.runtime.v1.RuntimeService.RenameFile:output_type -> rill.runtime.v1.RenameFileResponse
+	40,  // 118: rill.runtime.v1.RuntimeService.ListExamples:output_type -> rill.runtime.v1.ListExamplesResponse
+	42,  // 119: rill.runtime.v1.RuntimeService.UnpackExample:output_type -> rill.runtime.v1.UnpackExampleResponse
+	44,  // 120: rill.runtime.v1.RuntimeService.UnpackEmpty:output_type -> rill.runtime.v1.UnpackEmptyResponse
+	46,  // 121: rill.runtime.v1.RuntimeService.GenerateMetricsViewFile:output_type -> rill.runtime.v1.GenerateMetricsViewFileResponse
+	48,  // 122: rill.runtime.v1.RuntimeService.GenerateResolver:output_type -> rill.runtime.v1.GenerateResolverResponse
+	50,  // 123: rill.runtime.v1.RuntimeService.GenerateRenderer:output_type -> rill.runtime.v1.GenerateRendererResponse
+	54,  // 124: rill.runtime.v1.RuntimeService.GetLogs:output_type -> rill.runtime.v1.GetLogsResponse
+	56,  // 125: rill.runtime.v1.RuntimeService.WatchLogs:output_type -> rill.runtime.v1.WatchLogsResponse
+	58,  // 126: rill.runtime.v1.RuntimeService.ListResources:output_type -> rill.runtime.v1.ListResourcesResponse
+	60,  // 127: rill.runtime.v1.RuntimeService.WatchResources:output_type -> rill.runtime.v1.WatchResourcesResponse
+	62,  // 128: rill.runtime.v1.RuntimeService.GetResource:output_type -> rill.runtime.v1.GetResourceResponse
+	64,  // 129: rill.runtime.v1.RuntimeService.GetExplore:output_type -> rill.runtime.v1.GetExploreResponse
+	66,  // 130: rill.runtime.v1.RuntimeService.GetModelPartitions:output_type -> rill.runtime.v1.GetModelPartitionsResponse
+	68,  // 131: rill.runtime.v1.RuntimeService.CreateTrigger:output_type -> rill.runtime.v1.CreateTriggerResponse
+	72,  // 132: rill.runtime.v1.RuntimeService.ListConnectorDrivers:output_type -> rill.runtime.v1.ListConnectorDriversResponse
+	74,  // 133: rill.runtime.v1.RuntimeService.AnalyzeConnectors:output_type -> rill.runtime.v1.AnalyzeConnectorsResponse
+	76,  // 134: rill.runtime.v1.RuntimeService.ListNotifierConnectors:output_type -> rill.runtime.v1.ListNotifierConnectorsResponse
+	78,  // 135: rill.runtime.v1.RuntimeService.IssueDevJWT:output_type -> rill.runtime.v1.IssueDevJWTResponse
+	80,  // 136: rill.runtime.v1.RuntimeService.AnalyzeVariables:output_type -> rill.runtime.v1.AnalyzeVariablesResponse
+	103, // [103:137] is the sub-list for method output_type
+	69,  // [69:103] is the sub-list for method input_type
+	69,  // [69:69] is the sub-list for extension type_name
+	69,  // [69:69] is the sub-list for extension extendee
+	0,   // [0:69] is the sub-list for field type_name
 }
 
 func init() { file_rill_runtime_v1_api_proto_init() }
diff --git a/proto/gen/rill/runtime/v1/api.pb.validate.go b/proto/gen/rill/runtime/v1/api.pb.validate.go
index fb5685858bd..babf97a10ba 100644
--- a/proto/gen/rill/runtime/v1/api.pb.validate.go
+++ b/proto/gen/rill/runtime/v1/api.pb.validate.go
@@ -9515,6 +9515,35 @@ func (m *IssueDevJWTRequest) validate(all bool) error {
 
 	// no validation rules for Admin
 
+	if all {
+		switch v := interface{}(m.GetAttributes()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, IssueDevJWTRequestValidationError{
+					field:  "Attributes",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, IssueDevJWTRequestValidationError{
+					field:  "Attributes",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetAttributes()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return IssueDevJWTRequestValidationError{
+				field:  "Attributes",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
 	if len(errors) > 0 {
 		return IssueDevJWTRequestMultiError(errors)
 	}
diff --git a/proto/gen/rill/runtime/v1/runtime.swagger.yaml b/proto/gen/rill/runtime/v1/runtime.swagger.yaml
index fd00a6a8eae..c8a8d326404 100644
--- a/proto/gen/rill/runtime/v1/runtime.swagger.yaml
+++ b/proto/gen/rill/runtime/v1/runtime.swagger.yaml
@@ -4672,6 +4672,11 @@ definitions:
           type: string
       admin:
         type: boolean
+      attributes:
+        type: object
+        description: |-
+          Additional arbitrary attributes to include in the JWT.
+          They take precedence if they collide with name, email, groups or admin.
     title: Request message for RuntimeService.IssueDevJWT
   v1IssueDevJWTResponse:
     type: object
diff --git a/proto/rill/runtime/v1/api.proto b/proto/rill/runtime/v1/api.proto
index a244ca028a2..3c200316d2c 100644
--- a/proto/rill/runtime/v1/api.proto
+++ b/proto/rill/runtime/v1/api.proto
@@ -847,6 +847,9 @@ message IssueDevJWTRequest {
   string email = 2 [(validate.rules).string.min_len = 1];
   repeated string groups = 3;
   bool admin = 4;
+  // Additional arbitrary attributes to include in the JWT.
+  // They take precedence if they collide with name, email, groups or admin.
+  google.protobuf.Struct attributes = 5;
 }
 
 // Response message for RuntimeService.IssueDevJWT
diff --git a/runtime/compilers/rillv1/parse_rillyaml.go b/runtime/compilers/rillv1/parse_rillyaml.go
index 08c8b6d0bf0..d1b622071d5 100644
--- a/runtime/compilers/rillv1/parse_rillyaml.go
+++ b/runtime/compilers/rillv1/parse_rillyaml.go
@@ -94,10 +94,11 @@ type rillYAML struct {
 	// A list of mock users to test against dashboard security policies.
 	// This is ignored in this parser because it's consumed directly by the local application.
 	MockUsers []struct {
-		Email  string   `yaml:"email"`
-		Name   string   `yaml:"name"`
-		Admin  bool     `yaml:"admin"`
-		Groups []string `yaml:"groups"`
+		Email      string         `yaml:"email"`
+		Name       string         `yaml:"name"`
+		Admin      bool           `yaml:"admin"`
+		Groups     []string       `yaml:"groups"`
+		Attributes map[string]any `yaml:",inline"`
 	} `yaml:"mock_users"`
 }
 
diff --git a/runtime/compilers/rillv1/parser_test.go b/runtime/compilers/rillv1/parser_test.go
index 560e095c323..452e0f5a2b7 100644
--- a/runtime/compilers/rillv1/parser_test.go
+++ b/runtime/compilers/rillv1/parser_test.go
@@ -36,6 +36,10 @@ connectors:
 
 env:
   foo: bar
+
+mock_users:
+- email: foo@bar.com
+  custom_attribute: yeah
 `,
 	})
 
diff --git a/runtime/server/server.go b/runtime/server/server.go
index 5942f730c4e..43d61984c3b 100644
--- a/runtime/server/server.go
+++ b/runtime/server/server.go
@@ -361,15 +361,25 @@ func (s *Server) IssueDevJWT(ctx context.Context, req *runtimev1.IssueDevJWTRequ
 	attr := map[string]any{
 		"name":   req.Name,
 		"email":  req.Email,
-		"domain": req.Email[strings.LastIndex(req.Email, "@")+1:],
 		"groups": req.Groups,
 		"admin":  req.Admin,
 	}
 
+	for k, v := range req.Attributes.AsMap() {
+		attr[k] = v
+	}
+
+	// If possible, add "domain" inferred from "email"
+	email, ok := attr["email"].(string)
+	if ok && attr["domain"] == nil {
+		attr["domain"] = email[strings.LastIndex(email, "@")+1:]
+	}
+
 	jwt, err := auth.NewDevToken(attr)
 	if err != nil {
 		return nil, err
 	}
+
 	return &runtimev1.IssueDevJWTResponse{
 		Jwt: jwt,
 	}, nil
diff --git a/web-common/src/proto/gen/rill/runtime/v1/api_pb.ts b/web-common/src/proto/gen/rill/runtime/v1/api_pb.ts
index a23aa611aa5..4fbb8b25389 100644
--- a/web-common/src/proto/gen/rill/runtime/v1/api_pb.ts
+++ b/web-common/src/proto/gen/rill/runtime/v1/api_pb.ts
@@ -4045,6 +4045,14 @@ export class IssueDevJWTRequest extends Message<IssueDevJWTRequest> {
    */
   admin = false;
 
+  /**
+   * Additional arbitrary attributes to include in the JWT.
+   * They take precedence if they collide with name, email, groups or admin.
+   *
+   * @generated from field: google.protobuf.Struct attributes = 5;
+   */
+  attributes?: Struct;
+
   constructor(data?: PartialMessage<IssueDevJWTRequest>) {
     super();
     proto3.util.initPartial(data, this);
@@ -4057,6 +4065,7 @@ export class IssueDevJWTRequest extends Message<IssueDevJWTRequest> {
     { no: 2, name: "email", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 3, name: "groups", kind: "scalar", T: 9 /* ScalarType.STRING */, repeated: true },
     { no: 4, name: "admin", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
+    { no: 5, name: "attributes", kind: "message", T: Struct },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): IssueDevJWTRequest {
diff --git a/web-common/src/runtime-client/gen/index.schemas.ts b/web-common/src/runtime-client/gen/index.schemas.ts
index 8f5d39376ff..65cbdec7075 100644
--- a/web-common/src/runtime-client/gen/index.schemas.ts
+++ b/web-common/src/runtime-client/gen/index.schemas.ts
@@ -607,6 +607,12 @@ export interface V1TimeSeriesValue {
   records?: V1TimeSeriesValueRecords;
 }
 
+export interface V1TimeSeriesTimeRange {
+  start?: string;
+  end?: string;
+  interval?: V1TimeGrain;
+}
+
 export interface V1TimeSeriesResponse {
   results?: V1TimeSeriesValue[];
   spark?: V1TimeSeriesValue[];
@@ -635,12 +641,6 @@ export const V1TimeGrain = {
   TIME_GRAIN_YEAR: "TIME_GRAIN_YEAR",
 } as const;
 
-export interface V1TimeSeriesTimeRange {
-  start?: string;
-  end?: string;
-  interval?: V1TimeGrain;
-}
-
 export interface V1TimeRange {
   start?: string;
   end?: string;
@@ -857,26 +857,6 @@ export const V1ResourceEvent = {
   RESOURCE_EVENT_DELETE: "RESOURCE_EVENT_DELETE",
 } as const;
 
-export interface V1Resource {
-  meta?: V1ResourceMeta;
-  projectParser?: V1ProjectParser;
-  source?: V1SourceV2;
-  model?: V1ModelV2;
-  metricsView?: V1MetricsViewV2;
-  explore?: V1Explore;
-  migration?: V1Migration;
-  report?: V1Report;
-  alert?: V1Alert;
-  pullTrigger?: V1PullTrigger;
-  refreshTrigger?: V1RefreshTrigger;
-  bucketPlanner?: V1BucketPlanner;
-  theme?: V1Theme;
-  component?: V1Component;
-  canvas?: V1Canvas;
-  api?: V1API;
-  connector?: V1ConnectorV2;
-}
-
 export type V1ResolveComponentResponseRendererProperties = {
   [key: string]: any;
 };
@@ -911,6 +891,13 @@ The resources state.valid_spec.renderer_properties will have templating resolved
   referencedMetricsViews?: V1ResolveCanvasResponseReferencedMetricsViews;
 }
 
+export interface V1ReportState {
+  nextRunOn?: string;
+  currentExecution?: V1ReportExecution;
+  executionHistory?: V1ReportExecution[];
+  executionCount?: number;
+}
+
 export type V1ReportSpecAnnotations = { [key: string]: string };
 
 export interface V1ReportSpec {
@@ -939,18 +926,31 @@ export interface V1ReportExecution {
   finishedOn?: string;
 }
 
-export interface V1ReportState {
-  nextRunOn?: string;
-  currentExecution?: V1ReportExecution;
-  executionHistory?: V1ReportExecution[];
-  executionCount?: number;
-}
-
 export interface V1Report {
   spec?: V1ReportSpec;
   state?: V1ReportState;
 }
 
+export interface V1Resource {
+  meta?: V1ResourceMeta;
+  projectParser?: V1ProjectParser;
+  source?: V1SourceV2;
+  model?: V1ModelV2;
+  metricsView?: V1MetricsViewV2;
+  explore?: V1Explore;
+  migration?: V1Migration;
+  report?: V1Report;
+  alert?: V1Alert;
+  pullTrigger?: V1PullTrigger;
+  refreshTrigger?: V1RefreshTrigger;
+  bucketPlanner?: V1BucketPlanner;
+  theme?: V1Theme;
+  component?: V1Component;
+  canvas?: V1Canvas;
+  api?: V1API;
+  connector?: V1ConnectorV2;
+}
+
 export interface V1RenameFileResponse {
   [key: string]: any;
 }
@@ -959,6 +959,14 @@ export interface V1RefreshTriggerState {
   [key: string]: any;
 }
 
+export interface V1RefreshTriggerSpec {
+  /** Resources to refresh. The refreshable types are sources, models, alerts, reports, and the project parser.
+If a model is specified, a normal incremental refresh is triggered. Use the "models" field to trigger other kinds of model refreshes. */
+  resources?: V1ResourceName[];
+  /** Models to refresh. These are specified separately to enable more fine-grained configuration. */
+  models?: V1RefreshModelTrigger[];
+}
+
 export interface V1RefreshTrigger {
   spec?: V1RefreshTriggerSpec;
   state?: V1RefreshTriggerState;
@@ -976,14 +984,6 @@ For non-incremental models, this is equivalent to a normal refresh. */
   allErroredPartitions?: boolean;
 }
 
-export interface V1RefreshTriggerSpec {
-  /** Resources to refresh. The refreshable types are sources, models, alerts, reports, and the project parser.
-If a model is specified, a normal incremental refresh is triggered. Use the "models" field to trigger other kinds of model refreshes. */
-  resources?: V1ResourceName[];
-  /** Models to refresh. These are specified separately to enable more fine-grained configuration. */
-  models?: V1RefreshModelTrigger[];
-}
-
 export type V1ReconcileStatus =
   (typeof V1ReconcileStatus)[keyof typeof V1ReconcileStatus];
 
@@ -1418,6 +1418,11 @@ export interface V1MetricsViewSchemaResponse {
 
 export type V1MetricsViewRowsResponseDataItem = { [key: string]: any };
 
+export interface V1MetricsViewRowsResponse {
+  meta?: V1MetricsViewColumn[];
+  data?: V1MetricsViewRowsResponseDataItem[];
+}
+
 export interface V1MetricsViewFilter {
   include?: MetricsViewFilterCond[];
   exclude?: MetricsViewFilterCond[];
@@ -1531,11 +1536,6 @@ export interface V1MetricsViewColumn {
   nullable?: boolean;
 }
 
-export interface V1MetricsViewRowsResponse {
-  meta?: V1MetricsViewColumn[];
-  data?: V1MetricsViewRowsResponseDataItem[];
-}
-
 export interface V1MetricsViewAggregationSort {
   name?: string;
   desc?: boolean;
@@ -1548,6 +1548,31 @@ export interface V1MetricsViewAggregationResponse {
   data?: V1MetricsViewAggregationResponseDataItem[];
 }
 
+export interface V1MetricsViewAggregationRequest {
+  instanceId?: string;
+  metricsView?: string;
+  dimensions?: V1MetricsViewAggregationDimension[];
+  measures?: V1MetricsViewAggregationMeasure[];
+  sort?: V1MetricsViewAggregationSort[];
+  timeRange?: V1TimeRange;
+  comparisonTimeRange?: V1TimeRange;
+  timeStart?: string;
+  timeEnd?: string;
+  pivotOn?: string[];
+  aliases?: V1MetricsViewComparisonMeasureAlias[];
+  where?: V1Expression;
+  /** Optional. If both where and where_sql are set, both will be applied with an AND between them. */
+  whereSql?: string;
+  having?: V1Expression;
+  /** Optional. If both having and having_sql are set, both will be applied with an AND between them. */
+  havingSql?: string;
+  limit?: string;
+  offset?: string;
+  priority?: number;
+  filter?: V1MetricsViewFilter;
+  exact?: boolean;
+}
+
 export interface V1MetricsViewAggregationMeasureComputeURI {
   dimension?: string;
 }
@@ -1597,31 +1622,6 @@ export interface V1MetricsViewAggregationDimension {
   alias?: string;
 }
 
-export interface V1MetricsViewAggregationRequest {
-  instanceId?: string;
-  metricsView?: string;
-  dimensions?: V1MetricsViewAggregationDimension[];
-  measures?: V1MetricsViewAggregationMeasure[];
-  sort?: V1MetricsViewAggregationSort[];
-  timeRange?: V1TimeRange;
-  comparisonTimeRange?: V1TimeRange;
-  timeStart?: string;
-  timeEnd?: string;
-  pivotOn?: string[];
-  aliases?: V1MetricsViewComparisonMeasureAlias[];
-  where?: V1Expression;
-  /** Optional. If both where and where_sql are set, both will be applied with an AND between them. */
-  whereSql?: string;
-  having?: V1Expression;
-  /** Optional. If both having and having_sql are set, both will be applied with an AND between them. */
-  havingSql?: string;
-  limit?: string;
-  offset?: string;
-  priority?: number;
-  filter?: V1MetricsViewFilter;
-  exact?: boolean;
-}
-
 export interface V1MapType {
   keyType?: Runtimev1Type;
   valueType?: Runtimev1Type;
@@ -1676,11 +1676,20 @@ export interface V1IssueDevJWTResponse {
   jwt?: string;
 }
 
+/**
+ * Additional arbitrary attributes to include in the JWT.
+They take precedence if they collide with name, email, groups or admin.
+ */
+export type V1IssueDevJWTRequestAttributes = { [key: string]: any };
+
 export interface V1IssueDevJWTRequest {
   name?: string;
   email?: string;
   groups?: string[];
   admin?: boolean;
+  /** Additional arbitrary attributes to include in the JWT.
+They take precedence if they collide with name, email, groups or admin. */
+  attributes?: V1IssueDevJWTRequestAttributes;
 }
 
 export type V1InstanceHealthMetricsViewErrors = { [key: string]: string };
@@ -2063,6 +2072,17 @@ export interface V1ConnectorState {
   specHash?: string;
 }
 
+export interface V1ConnectorSpec {
+  driver?: string;
+  properties?: V1ConnectorSpecProperties;
+  templatedProperties?: string[];
+  provision?: boolean;
+  provisionArgs?: V1ConnectorSpecProvisionArgs;
+  /** DEPRECATED: properties_from_variables stores properties whose value is a variable.
+NOTE : properties_from_variables and properties both should be used to get all properties. */
+  propertiesFromVariables?: V1ConnectorSpecPropertiesFromVariables;
+}
+
 export interface V1ConnectorV2 {
   spec?: V1ConnectorSpec;
   state?: V1ConnectorState;
@@ -2078,17 +2098,6 @@ export type V1ConnectorSpecProvisionArgs = { [key: string]: any };
 
 export type V1ConnectorSpecProperties = { [key: string]: string };
 
-export interface V1ConnectorSpec {
-  driver?: string;
-  properties?: V1ConnectorSpecProperties;
-  templatedProperties?: string[];
-  provision?: boolean;
-  provisionArgs?: V1ConnectorSpecProvisionArgs;
-  /** DEPRECATED: properties_from_variables stores properties whose value is a variable.
-NOTE : properties_from_variables and properties both should be used to get all properties. */
-  propertiesFromVariables?: V1ConnectorSpecPropertiesFromVariables;
-}
-
 /**
  * ConnectorDriver represents a connector driver available in the runtime.
  */
@@ -2326,10 +2335,6 @@ export interface V1CategoricalSummary {
   cardinality?: number;
 }
 
-export interface V1CanvasState {
-  validSpec?: V1CanvasSpec;
-}
-
 export interface V1CanvasPreset {
   /** Time range for the explore.
 It corresponds to the `range` property of the explore's `time_ranges`.
@@ -2379,6 +2384,10 @@ The values should be valid IANA location identifiers. */
   securityRules?: V1SecurityRule[];
 }
 
+export interface V1CanvasState {
+  validSpec?: V1CanvasSpec;
+}
+
 export interface V1Canvas {
   spec?: V1CanvasSpec;
   state?: V1CanvasState;

From 98894231c314688fb4974a37ce4bec0de795bf20 Mon Sep 17 00:00:00 2001
From: Graham Plata <graham.plata@gmail.com>
Date: Thu, 23 Jan 2025 09:46:06 -0500
Subject: [PATCH 48/48] check admin for resource listing

---
 runtime/server/controller.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/runtime/server/controller.go b/runtime/server/controller.go
index d368fd5ac6a..3ce8d175280 100644
--- a/runtime/server/controller.go
+++ b/runtime/server/controller.go
@@ -61,6 +61,10 @@ func (s *Server) ListResources(ctx context.Context, req *runtimev1.ListResources
 		return strings.Compare(an.Name, bn.Name)
 	})
 
+	// Check if the requester is an admin
+	claims := auth.GetClaims(ctx)
+	isAdmin := claims.SecurityClaims().Admin()
+
 	i := 0
 	for i < len(rs) {
 		r := rs[i]
@@ -68,10 +72,10 @@ func (s *Server) ListResources(ctx context.Context, req *runtimev1.ListResources
 		if err != nil {
 			return nil, status.Error(codes.InvalidArgument, err.Error())
 		}
-		if !access {
+		// Admins can see all resources, even if they don't have access.
+		if !isAdmin && !access {
 			// Remove from the slice
 			rs[i] = rs[len(rs)-1]
-			rs[len(rs)-1] = nil
 			rs = rs[:len(rs)-1]
 			continue
 		}