diff --git a/query/promql/internal/promqltests/go.mod b/query/promql/internal/promqltests/go.mod
index ba4d4b0a9c..80ac153b76 100644
--- a/query/promql/internal/promqltests/go.mod
+++ b/query/promql/internal/promqltests/go.mod
@@ -10,7 +10,6 @@ require (
 	github.com/glycerine/go-unsnap-stream v0.0.0-20190901134440-81cf024a9e0a // indirect
 	github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 // indirect
 	github.com/go-kit/kit v0.10.0 // indirect
-	github.com/gogo/protobuf v1.3.1 // indirect
 	github.com/google/go-cmp v0.4.0
 	github.com/google/uuid v1.1.1 // indirect
 	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
diff --git a/storage/reads/datatypes/storage_common.pb.go b/storage/reads/datatypes/storage_common.pb.go
index 9cc244f9a7..78dbe1bbed 100644
--- a/storage/reads/datatypes/storage_common.pb.go
+++ b/storage/reads/datatypes/storage_common.pb.go
@@ -868,6 +868,9 @@ func (m *Capability) XXX_DiscardUnknown() {
 var xxx_messageInfo_Capability proto.InternalMessageInfo
 
 type CapabilitiesResponse struct {
+	// Capabilities contains the set of capabilities supported
+	// by the storage engine. It is a map of method names to
+	// the detailed capability information for the method.
 	Caps map[string]*Capability `protobuf:"bytes,1,rep,name=caps,proto3" json:"caps,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
@@ -1308,9 +1311,11 @@ func (m *MeasurementFieldsResponse_MessageField) XXX_DiscardUnknown() {
 var xxx_messageInfo_MeasurementFieldsResponse_MessageField proto.InternalMessageInfo
 
 type ReadWindowAggregateRequest struct {
-	ReadSource *types.Any     `protobuf:"bytes,1,opt,name=read_source,json=readSource,proto3" json:"read_source,omitempty"`
-	Range      TimestampRange `protobuf:"bytes,2,opt,name=range,proto3" json:"range"`
-	Predicate  *Predicate     `protobuf:"bytes,3,opt,name=predicate,proto3" json:"predicate,omitempty"`
+	ReadSource  *types.Any     `protobuf:"bytes,1,opt,name=read_source,json=readSource,proto3" json:"read_source,omitempty"`
+	Range       TimestampRange `protobuf:"bytes,2,opt,name=range,proto3" json:"range"`
+	Predicate   *Predicate     `protobuf:"bytes,3,opt,name=predicate,proto3" json:"predicate,omitempty"`
+	WindowEvery int64          `protobuf:"varint,4,opt,name=WindowEvery,proto3" json:"WindowEvery,omitempty"`
+	Aggregate   []*Aggregate   `protobuf:"bytes,5,rep,name=aggregate,proto3" json:"aggregate,omitempty"`
 }
 
 func (m *ReadWindowAggregateRequest) Reset()         { *m = ReadWindowAggregateRequest{} }
@@ -1385,114 +1390,115 @@ func init() {
 func init() { proto.RegisterFile("storage_common.proto", fileDescriptor_715e4bf4cdf1f73d) }
 
 var fileDescriptor_715e4bf4cdf1f73d = []byte{
-	// 1702 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0xcd, 0x8f, 0x23, 0x47,
-	0x15, 0x77, 0xfb, 0x6b, 0xa6, 0x9f, 0x3d, 0xde, 0x9e, 0x8a, 0xd9, 0x78, 0x7b, 0xb3, 0x76, 0xc7,
-	0x40, 0x32, 0x12, 0x8b, 0x47, 0x9a, 0x04, 0x29, 0x5a, 0x88, 0xc4, 0x78, 0xd6, 0x33, 0x36, 0x3b,
-	0x63, 0x8f, 0xda, 0x9e, 0x20, 0xb8, 0x98, 0x9a, 0x71, 0xb9, 0xd3, 0x8a, 0xdd, 0x6d, 0xba, 0xdb,
-	0x61, 0x2d, 0x71, 0xe1, 0x16, 0xf9, 0x14, 0x24, 0xb8, 0x20, 0xf9, 0xc4, 0x91, 0x3b, 0x7f, 0xc3,
-	0x22, 0x21, 0x91, 0x23, 0x27, 0x0b, 0xbc, 0x12, 0x12, 0x57, 0x6e, 0x84, 0x0b, 0xaa, 0xaf, 0x76,
-	0x7b, 0x76, 0x99, 0xd8, 0xab, 0x39, 0xa0, 0xcd, 0xad, 0xea, 0xd5, 0xab, 0xdf, 0xfb, 0xe8, 0xf7,
-	0x55, 0x0d, 0x79, 0x3f, 0x70, 0x3d, 0x6c, 0x91, 0xee, 0x95, 0x3b, 0x1c, 0xba, 0x4e, 0x65, 0xe4,
-	0xb9, 0x81, 0x8b, 0xee, 0xdb, 0x4e, 0x7f, 0x30, 0x7e, 0xda, 0xc3, 0x01, 0xae, 0x8c, 0x06, 0x38,
-	0xe8, 0xbb, 0xde, 0xb0, 0x22, 0x38, 0xf5, 0xbc, 0xe5, 0x5a, 0x2e, 0xe3, 0xdb, 0xa7, 0x2b, 0x7e,
-	0x45, 0xbf, 0x67, 0xb9, 0xae, 0x35, 0x20, 0xfb, 0x6c, 0x77, 0x39, 0xee, 0xef, 0x63, 0x67, 0x22,
-	0x8e, 0xee, 0x8c, 0x3c, 0xd2, 0xb3, 0xaf, 0x70, 0x40, 0x38, 0xa1, 0xfc, 0x4f, 0x05, 0x76, 0x4d,
-	0x82, 0x7b, 0xc7, 0xf6, 0x20, 0x20, 0x9e, 0x49, 0x7e, 0x3e, 0x26, 0x7e, 0x80, 0x6a, 0x90, 0xf1,
-	0x08, 0xee, 0x75, 0x7d, 0x77, 0xec, 0x5d, 0x91, 0x82, 0x62, 0x28, 0x7b, 0x99, 0x83, 0x7c, 0x85,
-	0xe3, 0x56, 0x24, 0x6e, 0xe5, 0xd0, 0x99, 0x54, 0x73, 0x8b, 0x79, 0x09, 0x28, 0x42, 0x9b, 0xf1,
-	0x9a, 0xe0, 0x85, 0x6b, 0x74, 0x02, 0x29, 0x0f, 0x3b, 0x16, 0x29, 0xc4, 0x19, 0xc0, 0x77, 0x2a,
-	0x37, 0xd8, 0x52, 0xe9, 0xd8, 0x43, 0xe2, 0x07, 0x78, 0x38, 0x32, 0xe9, 0x95, 0x6a, 0xf2, 0xd9,
-	0xbc, 0x14, 0x33, 0xf9, 0x7d, 0xf4, 0x18, 0xd4, 0x50, 0xf1, 0x42, 0x82, 0x81, 0xbd, 0x73, 0x23,
-	0xd8, 0xb9, 0xe4, 0x36, 0x97, 0x17, 0xcb, 0x7f, 0x4e, 0x81, 0x46, 0x35, 0x3d, 0xf1, 0xdc, 0xf1,
-	0xe8, 0xb5, 0x36, 0x15, 0x3d, 0x04, 0xb0, 0xa8, 0x95, 0xdd, 0x4f, 0xc8, 0xc4, 0x2f, 0x24, 0x8d,
-	0xc4, 0x9e, 0x5a, 0xdd, 0x59, 0xcc, 0x4b, 0x2a, 0xb3, 0xfd, 0x09, 0x99, 0xf8, 0xa6, 0x6a, 0xc9,
-	0x25, 0x6a, 0x40, 0x8a, 0x6d, 0x0a, 0x29, 0x43, 0xd9, 0xcb, 0x1d, 0xbc, 0x77, 0xa3, 0xbc, 0xeb,
-	0x1e, 0xac, 0xf0, 0x0d, 0x47, 0xa0, 0xea, 0x63, 0xcb, 0xf2, 0x88, 0x45, 0xd5, 0x4f, 0xaf, 0xa1,
-	0xfe, 0xa1, 0xe4, 0x36, 0x97, 0x17, 0xd1, 0x43, 0x48, 0x7d, 0x6c, 0x3b, 0x81, 0x5f, 0xd8, 0x32,
-	0x94, 0xbd, 0xad, 0xea, 0xdd, 0xc5, 0xbc, 0x94, 0xaa, 0x53, 0xc2, 0x97, 0xf3, 0x92, 0x4a, 0x17,
-	0xc7, 0x03, 0x6c, 0xf9, 0x26, 0x67, 0x2a, 0x9f, 0x40, 0x8a, 0xe9, 0x80, 0x1e, 0x00, 0x9c, 0x98,
-	0xad, 0x8b, 0xf3, 0x6e, 0xb3, 0xd5, 0xac, 0x69, 0x31, 0x7d, 0x67, 0x3a, 0x33, 0xb8, 0xc5, 0x4d,
-	0xd7, 0x21, 0xe8, 0x1e, 0x6c, 0xf3, 0xe3, 0xea, 0x4f, 0xb4, 0xb8, 0x9e, 0x99, 0xce, 0x8c, 0x2d,
-	0x76, 0x58, 0x9d, 0xe8, 0xc9, 0xcf, 0x7e, 0x5f, 0x8c, 0x95, 0xff, 0xa0, 0xc0, 0x12, 0x1d, 0xdd,
-	0x07, 0xb5, 0xde, 0x68, 0x76, 0x24, 0x58, 0x76, 0x3a, 0x33, 0xb6, 0xe9, 0x29, 0xc3, 0xfa, 0x16,
-	0xe4, 0xc4, 0x61, 0xf7, 0xbc, 0xd5, 0x68, 0x76, 0xda, 0x9a, 0xa2, 0x6b, 0xd3, 0x99, 0x91, 0xe5,
-	0x1c, 0xe7, 0x2e, 0xd5, 0x2c, 0xca, 0xd5, 0xae, 0x99, 0x8d, 0x5a, 0x5b, 0x8b, 0x47, 0xb9, 0xda,
-	0xc4, 0xb3, 0x89, 0x8f, 0xf6, 0x21, 0xcf, 0xb8, 0xda, 0x47, 0xf5, 0xda, 0xd9, 0x61, 0xf7, 0xf0,
-	0xf4, 0xb4, 0xdb, 0x69, 0x9c, 0xd5, 0xb4, 0xa4, 0xfe, 0x8d, 0xe9, 0xcc, 0xd8, 0xa5, 0xbc, 0xed,
-	0xab, 0x8f, 0xc9, 0x10, 0x1f, 0x0e, 0x06, 0x34, 0x74, 0x84, 0xb6, 0x7f, 0x51, 0x40, 0x0d, 0xbd,
-	0x87, 0xea, 0x90, 0x0c, 0x26, 0x23, 0x1e, 0xc0, 0xb9, 0x83, 0xf7, 0xd7, 0xf3, 0xf9, 0x72, 0xd5,
-	0x99, 0x8c, 0x88, 0xc9, 0x10, 0xca, 0x4f, 0x61, 0x67, 0x85, 0x8c, 0x4a, 0x90, 0x14, 0x3e, 0x60,
-	0xfa, 0xac, 0x1c, 0x32, 0x67, 0x3c, 0x80, 0x44, 0xfb, 0xe2, 0x4c, 0x53, 0xf4, 0xfc, 0x74, 0x66,
-	0x68, 0x2b, 0xe7, 0xed, 0xf1, 0x10, 0xbd, 0x0d, 0xa9, 0xa3, 0xd6, 0x45, 0xb3, 0xa3, 0xc5, 0xf5,
-	0xbb, 0xd3, 0x99, 0x81, 0x56, 0x18, 0x8e, 0xdc, 0xb1, 0x13, 0x08, 0x8b, 0xbe, 0x0b, 0x89, 0x0e,
-	0xb6, 0x90, 0x06, 0x89, 0x4f, 0xc8, 0x84, 0x59, 0x92, 0x35, 0xe9, 0x12, 0xe5, 0x21, 0xf5, 0x29,
-	0x1e, 0x8c, 0x79, 0x76, 0x65, 0x4d, 0xbe, 0x29, 0xff, 0x3a, 0x07, 0x59, 0x1a, 0x8d, 0x26, 0xf1,
-	0x47, 0xae, 0xe3, 0x13, 0x74, 0x06, 0xe9, 0xbe, 0x87, 0x87, 0xc4, 0x2f, 0x28, 0x46, 0x62, 0x2f,
-	0x73, 0xb0, 0xff, 0x95, 0x81, 0x2c, 0xaf, 0x56, 0x8e, 0xe9, 0x3d, 0x91, 0x89, 0x02, 0x44, 0xff,
-	0x2c, 0x0d, 0x29, 0x46, 0x47, 0xa7, 0x32, 0x41, 0xb6, 0x58, 0x44, 0xbf, 0xbf, 0x3e, 0x2e, 0x0b,
-	0x30, 0x06, 0x52, 0x8f, 0xc9, 0x1c, 0x69, 0x41, 0xda, 0x67, 0x5f, 0x5e, 0x54, 0x9b, 0xef, 0xad,
-	0x0f, 0xc7, 0x23, 0x46, 0xe2, 0x09, 0x18, 0x34, 0x82, 0x6c, 0x7f, 0xe0, 0xe2, 0xa0, 0x3b, 0x62,
-	0x61, 0x27, 0x6a, 0xd0, 0xa3, 0x0d, 0xac, 0xa7, 0xb7, 0x79, 0xcc, 0x72, 0x47, 0xdc, 0x59, 0xcc,
-	0x4b, 0x99, 0x08, 0xb5, 0x1e, 0x33, 0x33, 0xfd, 0xe5, 0x16, 0x3d, 0x85, 0x9c, 0xed, 0x04, 0xc4,
-	0x22, 0x9e, 0x94, 0xc9, 0x4b, 0xd5, 0x0f, 0xd6, 0x97, 0xd9, 0xe0, 0xf7, 0xa3, 0x52, 0x77, 0x17,
-	0xf3, 0xd2, 0xce, 0x0a, 0xbd, 0x1e, 0x33, 0x77, 0xec, 0x28, 0x01, 0xfd, 0x12, 0xee, 0x8c, 0x1d,
-	0xdf, 0xb6, 0x1c, 0xd2, 0x93, 0xa2, 0x93, 0x4c, 0xf4, 0x87, 0xeb, 0x8b, 0xbe, 0x10, 0x00, 0x51,
-	0xd9, 0x68, 0x31, 0x2f, 0xe5, 0x56, 0x0f, 0xea, 0x31, 0x33, 0x37, 0x5e, 0xa1, 0x50, 0xbb, 0x2f,
-	0x5d, 0x77, 0x40, 0xb0, 0x23, 0x85, 0xa7, 0x36, 0xb5, 0xbb, 0xca, 0xef, 0xbf, 0x60, 0xf7, 0x0a,
-	0x9d, 0xda, 0x7d, 0x19, 0x25, 0xa0, 0x00, 0x76, 0xfc, 0xc0, 0xb3, 0x1d, 0x4b, 0x0a, 0xe6, 0xc5,
-	0xf5, 0xfb, 0x1b, 0xc4, 0x0e, 0xbb, 0x1e, 0x95, 0xab, 0x2d, 0xe6, 0xa5, 0x6c, 0x94, 0x5c, 0x8f,
-	0x99, 0x59, 0x3f, 0xb2, 0xaf, 0xa6, 0x21, 0x49, 0x91, 0xf5, 0xa7, 0x00, 0xcb, 0x48, 0x46, 0xef,
-	0xc0, 0x76, 0x80, 0x2d, 0xde, 0x5b, 0x68, 0xa6, 0x65, 0xab, 0x99, 0xc5, 0xbc, 0xb4, 0xd5, 0xc1,
-	0x16, 0xeb, 0x2c, 0x5b, 0x01, 0x5f, 0xa0, 0x2a, 0xa0, 0x11, 0xf6, 0x02, 0x3b, 0xb0, 0x5d, 0x87,
-	0x72, 0x77, 0x3f, 0xc5, 0x03, 0x1a, 0x9d, 0xf4, 0x46, 0x7e, 0x31, 0x2f, 0x69, 0xe7, 0xf2, 0xf4,
-	0x09, 0x99, 0x7c, 0x84, 0x07, 0xbe, 0xa9, 0x8d, 0xae, 0x51, 0xf4, 0xdf, 0x29, 0x90, 0x89, 0x44,
-	0x3d, 0x7a, 0x04, 0xc9, 0x00, 0x5b, 0x32, 0xc3, 0x8d, 0x9b, 0xfb, 0x2c, 0xb6, 0x44, 0x4a, 0xb3,
-	0x3b, 0xa8, 0x05, 0x2a, 0x65, 0xec, 0xb2, 0x42, 0x19, 0x67, 0x85, 0xf2, 0x60, 0x7d, 0xff, 0x3d,
-	0xc6, 0x01, 0x66, 0x65, 0x72, 0xbb, 0x27, 0x56, 0xfa, 0x8f, 0x40, 0xbb, 0x9e, 0x3a, 0xa8, 0x08,
-	0x10, 0xc8, 0xfe, 0xce, 0xd5, 0xd4, 0xcc, 0x08, 0x05, 0xdd, 0x85, 0x34, 0x2b, 0x5f, 0xdc, 0x11,
-	0x8a, 0x29, 0x76, 0xfa, 0x29, 0xa0, 0x17, 0x53, 0x62, 0x43, 0xb4, 0x44, 0x88, 0x76, 0x06, 0x6f,
-	0xbc, 0x24, 0xca, 0x37, 0x84, 0x4b, 0x46, 0x95, 0x7b, 0x31, 0x6e, 0x37, 0x44, 0xdb, 0x0e, 0xd1,
-	0x9e, 0xc0, 0xee, 0x0b, 0xc1, 0xb8, 0x21, 0x98, 0x2a, 0xc1, 0xca, 0x6d, 0x50, 0x19, 0x80, 0x68,
-	0x55, 0x69, 0xd1, 0x68, 0x63, 0xfa, 0x1b, 0xd3, 0x99, 0x71, 0x27, 0x3c, 0x12, 0xbd, 0xb6, 0x04,
-	0xe9, 0xb0, 0x5f, 0xaf, 0x32, 0x70, 0x5d, 0x44, 0x27, 0xfa, 0xa3, 0x02, 0xdb, 0xf2, 0x7b, 0xa3,
-	0xb7, 0x20, 0x75, 0x7c, 0xda, 0x3a, 0xec, 0x68, 0x31, 0x7d, 0x77, 0x3a, 0x33, 0x76, 0xe4, 0x01,
-	0xfb, 0xf4, 0xc8, 0x80, 0xad, 0x46, 0xb3, 0x53, 0x3b, 0xa9, 0x99, 0x12, 0x52, 0x9e, 0x8b, 0xcf,
-	0x89, 0xca, 0xb0, 0x7d, 0xd1, 0x6c, 0x37, 0x4e, 0x9a, 0xb5, 0xc7, 0x5a, 0x9c, 0xf7, 0x48, 0xc9,
-	0x22, 0xbf, 0x11, 0x45, 0xa9, 0xb6, 0x5a, 0xa7, 0xb5, 0xc3, 0xa6, 0x96, 0x58, 0x45, 0x11, 0x7e,
-	0x47, 0x45, 0x48, 0xb7, 0x3b, 0x66, 0xa3, 0x79, 0xa2, 0x25, 0x75, 0x34, 0x9d, 0x19, 0x39, 0xc9,
-	0xc0, 0x5d, 0x29, 0x14, 0xdf, 0x03, 0x38, 0xc2, 0x23, 0x7c, 0x69, 0x0f, 0xec, 0x60, 0x82, 0x74,
-	0xd8, 0xee, 0x13, 0x1c, 0x8c, 0x3d, 0xd1, 0x12, 0x55, 0x33, 0xdc, 0x97, 0xff, 0xa4, 0x40, 0x3e,
-	0x64, 0xb5, 0x89, 0x1f, 0x76, 0xd1, 0x16, 0x24, 0xaf, 0xf0, 0x48, 0x66, 0xd8, 0xcd, 0x05, 0xe6,
-	0x65, 0x00, 0x94, 0xe8, 0xd7, 0x9c, 0xc0, 0x9b, 0x98, 0x0c, 0x48, 0xff, 0x19, 0xa8, 0x21, 0x29,
-	0xda, 0xdc, 0x55, 0xde, 0xdc, 0x3f, 0x8c, 0x36, 0xf7, 0xcc, 0xc1, 0xbb, 0xeb, 0x09, 0x9c, 0x88,
-	0x29, 0xe0, 0x51, 0xfc, 0x03, 0xa5, 0xfc, 0x01, 0xe4, 0x56, 0x67, 0x6a, 0x3a, 0x31, 0xf8, 0x01,
-	0xf6, 0x02, 0x26, 0x28, 0x61, 0xf2, 0x0d, 0x15, 0x4e, 0x9c, 0x1e, 0x13, 0x94, 0x30, 0xe9, 0xb2,
-	0xfc, 0x0f, 0x05, 0x72, 0xb2, 0x6e, 0x2d, 0x5f, 0x04, 0xb4, 0x5a, 0xac, 0xfd, 0x22, 0xe8, 0x60,
-	0xcb, 0x97, 0x2f, 0x82, 0x20, 0x5c, 0xff, 0xbf, 0x3d, 0x7e, 0x7e, 0x15, 0x07, 0xad, 0x83, 0xad,
-	0x8f, 0x58, 0xd2, 0xbc, 0xd6, 0xa6, 0xa2, 0x37, 0x61, 0x4b, 0xb4, 0x27, 0x36, 0x1a, 0xa8, 0x66,
-	0x9a, 0x37, 0xa4, 0x72, 0x05, 0xf2, 0x3c, 0x59, 0xa4, 0x17, 0x44, 0xc4, 0x2f, 0x4b, 0x0b, 0xeb,
-	0x66, 0x61, 0x69, 0xf9, 0x5c, 0x81, 0x37, 0xcf, 0x08, 0xf6, 0xc7, 0x1e, 0x19, 0x12, 0x27, 0x68,
-	0xd2, 0xa9, 0x50, 0xba, 0xee, 0x21, 0xa4, 0xbf, 0xda, 0x6b, 0xa6, 0xe0, 0xb9, 0x35, 0x0f, 0x95,
-	0xbf, 0x54, 0xe0, 0x5e, 0x44, 0xa5, 0x6b, 0xa1, 0xbb, 0x99, 0x52, 0x06, 0x64, 0x86, 0x4b, 0x28,
-	0xa6, 0x9a, 0x6a, 0x46, 0x49, 0x4b, 0xb5, 0x13, 0xb7, 0xf9, 0x61, 0x93, 0xaf, 0x1a, 0xc3, 0xbf,
-	0x8d, 0xc3, 0xfd, 0x55, 0xe3, 0x57, 0xc3, 0xf9, 0xb6, 0xcd, 0x8f, 0x04, 0x52, 0x22, 0x1a, 0x48,
-	0x4b, 0xbf, 0x24, 0x6f, 0xd3, 0x2f, 0xa9, 0x57, 0xf5, 0xcb, 0xbf, 0x15, 0x28, 0x44, 0xfc, 0x72,
-	0x6c, 0x93, 0x41, 0xef, 0xeb, 0x12, 0x13, 0xff, 0x49, 0xac, 0x24, 0x84, 0xb4, 0x5d, 0x64, 0x36,
-	0x86, 0x74, 0x9f, 0x51, 0x44, 0x37, 0x3b, 0xba, 0x51, 0xc0, 0xff, 0xc4, 0xa9, 0x9c, 0x11, 0xdf,
-	0xc7, 0x16, 0x61, 0xd4, 0xf0, 0x95, 0xc8, 0x58, 0xf4, 0xdf, 0x28, 0x90, 0x8d, 0x1e, 0xbf, 0xa4,
-	0xc3, 0x75, 0xc4, 0xdb, 0x9c, 0x8f, 0x9c, 0x3f, 0x7c, 0x45, 0x1d, 0xd8, 0x76, 0xf9, 0x4e, 0x47,
-	0x6f, 0x81, 0x1a, 0x8e, 0x47, 0xec, 0x63, 0x68, 0xe6, 0x92, 0x50, 0x7e, 0xae, 0x80, 0x1a, 0xde,
-	0x40, 0x0f, 0x96, 0x23, 0x0c, 0x9b, 0x1d, 0xc2, 0x13, 0x3e, 0xc3, 0xbc, 0x1d, 0x9d, 0x61, 0xd8,
-	0x80, 0x12, 0x32, 0xc8, 0x21, 0xe6, 0x9b, 0x2b, 0x43, 0x0c, 0xfb, 0x11, 0x10, 0xf2, 0x84, 0x53,
-	0x4c, 0x29, 0x9c, 0x51, 0xc4, 0x10, 0x13, 0xb2, 0xf0, 0xba, 0x4b, 0x05, 0xc9, 0x31, 0x27, 0x79,
-	0x4d, 0x90, 0x9c, 0x73, 0xbe, 0x0d, 0xea, 0x45, 0xf3, 0x71, 0xed, 0xb8, 0x41, 0x25, 0xa5, 0xf8,
-	0x1f, 0x83, 0x88, 0xa4, 0x1e, 0xe9, 0xdb, 0x0e, 0xe9, 0x89, 0x71, 0xe7, 0x5f, 0x0a, 0xe8, 0x74,
-	0x48, 0xff, 0xb1, 0xed, 0xf4, 0xdc, 0x5f, 0x2c, 0xff, 0x25, 0xbd, 0xce, 0x3f, 0xf7, 0xaa, 0xef,
-	0x3e, 0xfb, 0x7b, 0x31, 0xf6, 0x6c, 0x51, 0x54, 0xbe, 0x58, 0x14, 0x95, 0xbf, 0x2d, 0x8a, 0xca,
-	0xe7, 0xcf, 0x8b, 0xb1, 0x2f, 0x9e, 0x17, 0x63, 0x7f, 0x7d, 0x5e, 0x8c, 0xfd, 0x94, 0x3d, 0x71,
-	0x68, 0x80, 0xf8, 0x97, 0x69, 0x66, 0xe1, 0x7b, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x1f, 0x5f,
-	0xe8, 0x6b, 0x5a, 0x16, 0x00, 0x00,
+	// 1726 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0xcd, 0x8f, 0x1b, 0x49,
+	0x15, 0x77, 0xfb, 0x6b, 0xa6, 0x9f, 0x3d, 0x4e, 0x4f, 0xad, 0xc9, 0x3a, 0x9d, 0x8d, 0xdd, 0x6b,
+	0x60, 0x77, 0x24, 0x82, 0x47, 0x9a, 0x5d, 0xa4, 0x55, 0x60, 0x25, 0xc6, 0x13, 0xcf, 0xd8, 0x64,
+	0xc6, 0x1e, 0x95, 0x3d, 0x8b, 0xe0, 0x62, 0x6a, 0xc6, 0xe5, 0xde, 0xd6, 0xda, 0xdd, 0xa6, 0xbb,
+	0x1d, 0x62, 0x89, 0x0b, 0xb7, 0x95, 0x4f, 0x8b, 0x04, 0x17, 0x24, 0x9f, 0x38, 0x72, 0xe7, 0x6f,
+	0x08, 0x12, 0x12, 0x7b, 0x44, 0x1c, 0x2c, 0x70, 0x24, 0x24, 0xfe, 0x04, 0x96, 0x0b, 0xaa, 0xaa,
+	0xae, 0x76, 0x7b, 0x12, 0x26, 0x76, 0x94, 0x03, 0xca, 0xde, 0xaa, 0x5e, 0xbd, 0xfa, 0xbd, 0x8f,
+	0x7e, 0x5f, 0xd5, 0x90, 0xf7, 0x7c, 0xc7, 0x25, 0x26, 0xed, 0x5e, 0x39, 0xc3, 0xa1, 0x63, 0x57,
+	0x46, 0xae, 0xe3, 0x3b, 0xe8, 0xae, 0x65, 0xf7, 0x07, 0xe3, 0x27, 0x3d, 0xe2, 0x93, 0xca, 0x68,
+	0x40, 0xfc, 0xbe, 0xe3, 0x0e, 0x2b, 0x01, 0xa7, 0x9e, 0x37, 0x1d, 0xd3, 0xe1, 0x7c, 0xfb, 0x6c,
+	0x25, 0xae, 0xe8, 0x77, 0x4c, 0xc7, 0x31, 0x07, 0x74, 0x9f, 0xef, 0x2e, 0xc7, 0xfd, 0x7d, 0x62,
+	0x4f, 0x82, 0xa3, 0x5b, 0x23, 0x97, 0xf6, 0xac, 0x2b, 0xe2, 0x53, 0x41, 0x28, 0xff, 0x4b, 0x81,
+	0x5d, 0x4c, 0x49, 0xef, 0xd8, 0x1a, 0xf8, 0xd4, 0xc5, 0xf4, 0xe7, 0x63, 0xea, 0xf9, 0xa8, 0x06,
+	0x19, 0x97, 0x92, 0x5e, 0xd7, 0x73, 0xc6, 0xee, 0x15, 0x2d, 0x28, 0x86, 0xb2, 0x97, 0x39, 0xc8,
+	0x57, 0x04, 0x6e, 0x45, 0xe2, 0x56, 0x0e, 0xed, 0x49, 0x35, 0xb7, 0x98, 0x97, 0x80, 0x21, 0xb4,
+	0x39, 0x2f, 0x06, 0x37, 0x5c, 0xa3, 0x13, 0x48, 0xb9, 0xc4, 0x36, 0x69, 0x21, 0xce, 0x01, 0xbe,
+	0x53, 0xb9, 0xc1, 0x96, 0x4a, 0xc7, 0x1a, 0x52, 0xcf, 0x27, 0xc3, 0x11, 0x66, 0x57, 0xaa, 0xc9,
+	0xa7, 0xf3, 0x52, 0x0c, 0x8b, 0xfb, 0xe8, 0x21, 0xa8, 0xa1, 0xe2, 0x85, 0x04, 0x07, 0x7b, 0xef,
+	0x46, 0xb0, 0x73, 0xc9, 0x8d, 0x97, 0x17, 0xcb, 0x7f, 0x4e, 0x81, 0xc6, 0x34, 0x3d, 0x71, 0x9d,
+	0xf1, 0xe8, 0x8d, 0x36, 0x15, 0xdd, 0x07, 0x30, 0x99, 0x95, 0xdd, 0xcf, 0xe8, 0xc4, 0x2b, 0x24,
+	0x8d, 0xc4, 0x9e, 0x5a, 0xdd, 0x59, 0xcc, 0x4b, 0x2a, 0xb7, 0xfd, 0x11, 0x9d, 0x78, 0x58, 0x35,
+	0xe5, 0x12, 0x35, 0x20, 0xc5, 0x37, 0x85, 0x94, 0xa1, 0xec, 0xe5, 0x0e, 0x3e, 0xb8, 0x51, 0xde,
+	0x75, 0x0f, 0x56, 0xc4, 0x46, 0x20, 0x30, 0xf5, 0x89, 0x69, 0xba, 0xd4, 0x64, 0xea, 0xa7, 0xd7,
+	0x50, 0xff, 0x50, 0x72, 0xe3, 0xe5, 0x45, 0x74, 0x1f, 0x52, 0x9f, 0x5a, 0xb6, 0xef, 0x15, 0xb6,
+	0x0c, 0x65, 0x6f, 0xab, 0x7a, 0x7b, 0x31, 0x2f, 0xa5, 0xea, 0x8c, 0xf0, 0xd5, 0xbc, 0xa4, 0xb2,
+	0xc5, 0xf1, 0x80, 0x98, 0x1e, 0x16, 0x4c, 0xe5, 0x13, 0x48, 0x71, 0x1d, 0xd0, 0x3d, 0x80, 0x13,
+	0xdc, 0xba, 0x38, 0xef, 0x36, 0x5b, 0xcd, 0x9a, 0x16, 0xd3, 0x77, 0xa6, 0x33, 0x43, 0x58, 0xdc,
+	0x74, 0x6c, 0x8a, 0xee, 0xc0, 0xb6, 0x38, 0xae, 0xfe, 0x44, 0x8b, 0xeb, 0x99, 0xe9, 0xcc, 0xd8,
+	0xe2, 0x87, 0xd5, 0x89, 0x9e, 0xfc, 0xfc, 0xf7, 0xc5, 0x58, 0xf9, 0x0f, 0x0a, 0x2c, 0xd1, 0xd1,
+	0x5d, 0x50, 0xeb, 0x8d, 0x66, 0x47, 0x82, 0x65, 0xa7, 0x33, 0x63, 0x9b, 0x9d, 0x72, 0xac, 0x6f,
+	0x41, 0x2e, 0x38, 0xec, 0x9e, 0xb7, 0x1a, 0xcd, 0x4e, 0x5b, 0x53, 0x74, 0x6d, 0x3a, 0x33, 0xb2,
+	0x82, 0xe3, 0xdc, 0x61, 0x9a, 0x45, 0xb9, 0xda, 0x35, 0xdc, 0xa8, 0xb5, 0xb5, 0x78, 0x94, 0xab,
+	0x4d, 0x5d, 0x8b, 0x7a, 0x68, 0x1f, 0xf2, 0x9c, 0xab, 0x7d, 0x54, 0xaf, 0x9d, 0x1d, 0x76, 0x0f,
+	0x4f, 0x4f, 0xbb, 0x9d, 0xc6, 0x59, 0x4d, 0x4b, 0xea, 0xdf, 0x98, 0xce, 0x8c, 0x5d, 0xc6, 0xdb,
+	0xbe, 0xfa, 0x94, 0x0e, 0xc9, 0xe1, 0x60, 0xc0, 0x42, 0x27, 0xd0, 0xf6, 0x2f, 0x0a, 0xa8, 0xa1,
+	0xf7, 0x50, 0x1d, 0x92, 0xfe, 0x64, 0x24, 0x02, 0x38, 0x77, 0xf0, 0xe1, 0x7a, 0x3e, 0x5f, 0xae,
+	0x3a, 0x93, 0x11, 0xc5, 0x1c, 0xa1, 0xfc, 0x04, 0x76, 0x56, 0xc8, 0xa8, 0x04, 0xc9, 0xc0, 0x07,
+	0x5c, 0x9f, 0x95, 0x43, 0xee, 0x8c, 0x7b, 0x90, 0x68, 0x5f, 0x9c, 0x69, 0x8a, 0x9e, 0x9f, 0xce,
+	0x0c, 0x6d, 0xe5, 0xbc, 0x3d, 0x1e, 0xa2, 0x77, 0x21, 0x75, 0xd4, 0xba, 0x68, 0x76, 0xb4, 0xb8,
+	0x7e, 0x7b, 0x3a, 0x33, 0xd0, 0x0a, 0xc3, 0x91, 0x33, 0xb6, 0xfd, 0xc0, 0xa2, 0xef, 0x42, 0xa2,
+	0x43, 0x4c, 0xa4, 0x41, 0xe2, 0x33, 0x3a, 0xe1, 0x96, 0x64, 0x31, 0x5b, 0xa2, 0x3c, 0xa4, 0x1e,
+	0x93, 0xc1, 0x58, 0x64, 0x57, 0x16, 0x8b, 0x4d, 0xf9, 0xd7, 0x39, 0xc8, 0xb2, 0x68, 0xc4, 0xd4,
+	0x1b, 0x39, 0xb6, 0x47, 0xd1, 0x19, 0xa4, 0xfb, 0x2e, 0x19, 0x52, 0xaf, 0xa0, 0x18, 0x89, 0xbd,
+	0xcc, 0xc1, 0xfe, 0x4b, 0x03, 0x59, 0x5e, 0xad, 0x1c, 0xb3, 0x7b, 0x41, 0x26, 0x06, 0x20, 0xfa,
+	0xe7, 0x69, 0x48, 0x71, 0x3a, 0x3a, 0x95, 0x09, 0xb2, 0xc5, 0x23, 0xfa, 0xc3, 0xf5, 0x71, 0x79,
+	0x80, 0x71, 0x90, 0x7a, 0x4c, 0xe6, 0x48, 0x0b, 0xd2, 0x1e, 0xff, 0xf2, 0x41, 0xb5, 0xf9, 0xde,
+	0xfa, 0x70, 0x22, 0x62, 0x24, 0x5e, 0x00, 0x83, 0x46, 0x90, 0xed, 0x0f, 0x1c, 0xe2, 0x77, 0x47,
+	0x3c, 0xec, 0x82, 0x1a, 0xf4, 0x60, 0x03, 0xeb, 0xd9, 0x6d, 0x11, 0xb3, 0xc2, 0x11, 0xb7, 0x16,
+	0xf3, 0x52, 0x26, 0x42, 0xad, 0xc7, 0x70, 0xa6, 0xbf, 0xdc, 0xa2, 0x27, 0x90, 0xb3, 0x6c, 0x9f,
+	0x9a, 0xd4, 0x95, 0x32, 0x45, 0xa9, 0xfa, 0xc1, 0xfa, 0x32, 0x1b, 0xe2, 0x7e, 0x54, 0xea, 0xee,
+	0x62, 0x5e, 0xda, 0x59, 0xa1, 0xd7, 0x63, 0x78, 0xc7, 0x8a, 0x12, 0xd0, 0x2f, 0xe1, 0xd6, 0xd8,
+	0xf6, 0x2c, 0xd3, 0xa6, 0x3d, 0x29, 0x3a, 0xc9, 0x45, 0x7f, 0xbc, 0xbe, 0xe8, 0x8b, 0x00, 0x20,
+	0x2a, 0x1b, 0x2d, 0xe6, 0xa5, 0xdc, 0xea, 0x41, 0x3d, 0x86, 0x73, 0xe3, 0x15, 0x0a, 0xb3, 0xfb,
+	0xd2, 0x71, 0x06, 0x94, 0xd8, 0x52, 0x78, 0x6a, 0x53, 0xbb, 0xab, 0xe2, 0xfe, 0x73, 0x76, 0xaf,
+	0xd0, 0x99, 0xdd, 0x97, 0x51, 0x02, 0xf2, 0x61, 0xc7, 0xf3, 0x5d, 0xcb, 0x36, 0xa5, 0x60, 0x51,
+	0x5c, 0xbf, 0xbf, 0x41, 0xec, 0xf0, 0xeb, 0x51, 0xb9, 0xda, 0x62, 0x5e, 0xca, 0x46, 0xc9, 0xf5,
+	0x18, 0xce, 0x7a, 0x91, 0x7d, 0x35, 0x0d, 0x49, 0x86, 0xac, 0x3f, 0x01, 0x58, 0x46, 0x32, 0x7a,
+	0x0f, 0xb6, 0x7d, 0x62, 0x8a, 0xde, 0xc2, 0x32, 0x2d, 0x5b, 0xcd, 0x2c, 0xe6, 0xa5, 0xad, 0x0e,
+	0x31, 0x79, 0x67, 0xd9, 0xf2, 0xc5, 0x02, 0x55, 0x01, 0x8d, 0x88, 0xeb, 0x5b, 0xbe, 0xe5, 0xd8,
+	0x8c, 0xbb, 0xfb, 0x98, 0x0c, 0x58, 0x74, 0xb2, 0x1b, 0xf9, 0xc5, 0xbc, 0xa4, 0x9d, 0xcb, 0xd3,
+	0x47, 0x74, 0xf2, 0x09, 0x19, 0x78, 0x58, 0x1b, 0x5d, 0xa3, 0xe8, 0xbf, 0x53, 0x20, 0x13, 0x89,
+	0x7a, 0xf4, 0x00, 0x92, 0x3e, 0x31, 0x65, 0x86, 0x1b, 0x37, 0xf7, 0x59, 0x62, 0x06, 0x29, 0xcd,
+	0xef, 0xa0, 0x16, 0xa8, 0x8c, 0xb1, 0xcb, 0x0b, 0x65, 0x9c, 0x17, 0xca, 0x83, 0xf5, 0xfd, 0xf7,
+	0x90, 0xf8, 0x84, 0x97, 0xc9, 0xed, 0x5e, 0xb0, 0xd2, 0x7f, 0x04, 0xda, 0xf5, 0xd4, 0x41, 0x45,
+	0x00, 0x5f, 0xf6, 0x77, 0xa1, 0xa6, 0x86, 0x23, 0x14, 0x74, 0x1b, 0xd2, 0xbc, 0x7c, 0x09, 0x47,
+	0x28, 0x38, 0xd8, 0xe9, 0xa7, 0x80, 0x9e, 0x4f, 0x89, 0x0d, 0xd1, 0x12, 0x21, 0xda, 0x19, 0xbc,
+	0xf5, 0x82, 0x28, 0xdf, 0x10, 0x2e, 0x19, 0x55, 0xee, 0xf9, 0xb8, 0xdd, 0x10, 0x6d, 0x3b, 0x44,
+	0x7b, 0x04, 0xbb, 0xcf, 0x05, 0xe3, 0x86, 0x60, 0xaa, 0x04, 0x2b, 0xb7, 0x41, 0xe5, 0x00, 0x41,
+	0xab, 0x4a, 0x07, 0x8d, 0x36, 0xa6, 0xbf, 0x35, 0x9d, 0x19, 0xb7, 0xc2, 0xa3, 0xa0, 0xd7, 0x96,
+	0x20, 0x1d, 0xf6, 0xeb, 0x55, 0x06, 0xa1, 0x4b, 0xd0, 0x89, 0xfe, 0xa8, 0xc0, 0xb6, 0xfc, 0xde,
+	0xe8, 0x1d, 0x48, 0x1d, 0x9f, 0xb6, 0x0e, 0x3b, 0x5a, 0x4c, 0xdf, 0x9d, 0xce, 0x8c, 0x1d, 0x79,
+	0xc0, 0x3f, 0x3d, 0x32, 0x60, 0xab, 0xd1, 0xec, 0xd4, 0x4e, 0x6a, 0x58, 0x42, 0xca, 0xf3, 0xe0,
+	0x73, 0xa2, 0x32, 0x6c, 0x5f, 0x34, 0xdb, 0x8d, 0x93, 0x66, 0xed, 0xa1, 0x16, 0x17, 0x3d, 0x52,
+	0xb2, 0xc8, 0x6f, 0xc4, 0x50, 0xaa, 0xad, 0xd6, 0x69, 0xed, 0xb0, 0xa9, 0x25, 0x56, 0x51, 0x02,
+	0xbf, 0xa3, 0x22, 0xa4, 0xdb, 0x1d, 0xdc, 0x68, 0x9e, 0x68, 0x49, 0x1d, 0x4d, 0x67, 0x46, 0x4e,
+	0x32, 0x08, 0x57, 0x06, 0x8a, 0xef, 0x01, 0x1c, 0x91, 0x11, 0xb9, 0xb4, 0x06, 0x96, 0x3f, 0x41,
+	0x3a, 0x6c, 0xf7, 0x29, 0xf1, 0xc7, 0x6e, 0xd0, 0x12, 0x55, 0x1c, 0xee, 0xcb, 0x7f, 0x52, 0x20,
+	0x1f, 0xb2, 0x5a, 0xd4, 0x0b, 0xbb, 0x68, 0x0b, 0x92, 0x57, 0x64, 0x24, 0x33, 0xec, 0xe6, 0x02,
+	0xf3, 0x22, 0x00, 0x46, 0xf4, 0x6a, 0xb6, 0xef, 0x4e, 0x30, 0x07, 0xd2, 0x7f, 0x06, 0x6a, 0x48,
+	0x8a, 0x36, 0x77, 0x55, 0x34, 0xf7, 0x8f, 0xa3, 0xcd, 0x3d, 0x73, 0xf0, 0xfe, 0x7a, 0x02, 0x27,
+	0xc1, 0x14, 0xf0, 0x20, 0xfe, 0x91, 0x52, 0xfe, 0x08, 0x72, 0xab, 0x33, 0x35, 0x9b, 0x18, 0x3c,
+	0x9f, 0xb8, 0x3e, 0x17, 0x94, 0xc0, 0x62, 0xc3, 0x84, 0x53, 0xbb, 0xc7, 0x05, 0x25, 0x30, 0x5b,
+	0x96, 0xff, 0xa9, 0x40, 0x4e, 0xd6, 0xad, 0xe5, 0x8b, 0x80, 0x55, 0x8b, 0xb5, 0x5f, 0x04, 0x1d,
+	0x62, 0x7a, 0xf2, 0x45, 0xe0, 0x87, 0xeb, 0xff, 0xb7, 0xc7, 0xcf, 0xaf, 0xe2, 0xa0, 0x75, 0x88,
+	0xf9, 0x09, 0x4f, 0x9a, 0x37, 0xda, 0x54, 0xf4, 0x36, 0x6c, 0x05, 0xed, 0x89, 0x8f, 0x06, 0x2a,
+	0x4e, 0x8b, 0x86, 0x54, 0xae, 0x40, 0x5e, 0x24, 0x8b, 0xf4, 0x42, 0x10, 0xf1, 0xcb, 0xd2, 0xc2,
+	0xbb, 0x59, 0x58, 0x5a, 0xbe, 0x50, 0xe0, 0xed, 0x33, 0x4a, 0xbc, 0xb1, 0x4b, 0x87, 0xd4, 0xf6,
+	0x9b, 0x6c, 0x2a, 0x94, 0xae, 0xbb, 0x0f, 0xe9, 0x97, 0x7b, 0x0d, 0x07, 0x3c, 0xaf, 0xcd, 0x43,
+	0xe5, 0xaf, 0x14, 0xb8, 0x13, 0x51, 0xe9, 0x5a, 0xe8, 0x6e, 0xa6, 0x94, 0x01, 0x99, 0xe1, 0x12,
+	0x8a, 0xab, 0xa6, 0xe2, 0x28, 0x69, 0xa9, 0x76, 0xe2, 0x75, 0x7e, 0xd8, 0xe4, 0xab, 0xc6, 0xf0,
+	0x6f, 0xe3, 0x70, 0x77, 0xd5, 0xf8, 0xd5, 0x70, 0x7e, 0xdd, 0xe6, 0x47, 0x02, 0x29, 0x11, 0x0d,
+	0xa4, 0xa5, 0x5f, 0x92, 0xaf, 0xd3, 0x2f, 0xa9, 0x57, 0xf5, 0xcb, 0xbf, 0x15, 0x28, 0x44, 0xfc,
+	0x72, 0x6c, 0xd1, 0x41, 0xef, 0xeb, 0x12, 0x13, 0xff, 0x49, 0xac, 0x24, 0x84, 0xb4, 0x3d, 0xc8,
+	0x6c, 0x02, 0xe9, 0x3e, 0xa7, 0x04, 0xdd, 0xec, 0xe8, 0x46, 0x01, 0xff, 0x13, 0xa7, 0x72, 0x46,
+	0x3d, 0x8f, 0x98, 0x94, 0x53, 0xc3, 0x57, 0x22, 0x67, 0xd1, 0x7f, 0xa3, 0x40, 0x36, 0x7a, 0xfc,
+	0x82, 0x0e, 0xd7, 0x09, 0xde, 0xe6, 0x62, 0xe4, 0xfc, 0xe1, 0x2b, 0xea, 0xc0, 0xb7, 0xcb, 0x77,
+	0x3a, 0x7a, 0x07, 0xd4, 0x70, 0x3c, 0xe2, 0x1f, 0x43, 0xc3, 0x4b, 0x42, 0xf9, 0x99, 0x02, 0x6a,
+	0x78, 0x03, 0xdd, 0x5b, 0x8e, 0x30, 0x7c, 0x76, 0x08, 0x4f, 0xc4, 0x0c, 0xf3, 0x6e, 0x74, 0x86,
+	0xe1, 0x03, 0x4a, 0xc8, 0x20, 0x87, 0x98, 0x6f, 0xae, 0x0c, 0x31, 0xfc, 0x47, 0x40, 0xc8, 0x13,
+	0x4e, 0x31, 0xa5, 0x70, 0x46, 0x09, 0x86, 0x98, 0x90, 0x45, 0xd4, 0x5d, 0x26, 0x48, 0x8e, 0x39,
+	0xc9, 0x6b, 0x82, 0xe4, 0x9c, 0xf3, 0x6d, 0x50, 0x2f, 0x9a, 0x0f, 0x6b, 0xc7, 0x0d, 0x26, 0x29,
+	0x25, 0xfe, 0x18, 0x44, 0x24, 0xf5, 0x68, 0xdf, 0xb2, 0x69, 0x2f, 0x18, 0x77, 0xfe, 0x16, 0x07,
+	0x9d, 0x0d, 0xe9, 0x3f, 0xb6, 0xec, 0x9e, 0xf3, 0x8b, 0xe5, 0xbf, 0xa4, 0x37, 0xfa, 0xe7, 0x9e,
+	0x01, 0x19, 0x61, 0x6f, 0xed, 0x31, 0x75, 0x45, 0x8f, 0x4b, 0xe0, 0x28, 0x69, 0xf5, 0x2f, 0x5c,
+	0x8a, 0x47, 0xfe, 0xe6, 0x7f, 0xe1, 0xaa, 0xef, 0x3f, 0xfd, 0x47, 0x31, 0xf6, 0x74, 0x51, 0x54,
+	0xbe, 0x5c, 0x14, 0x95, 0xbf, 0x2f, 0x8a, 0xca, 0x17, 0xcf, 0x8a, 0xb1, 0x2f, 0x9f, 0x15, 0x63,
+	0x7f, 0x7d, 0x56, 0x8c, 0xfd, 0x94, 0x3f, 0xa5, 0x58, 0x20, 0x7a, 0x97, 0x69, 0xee, 0xc9, 0x0f,
+	0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x28, 0x7e, 0x19, 0x18, 0xc2, 0x16, 0x00, 0x00,
 }
 
 func (m *ReadFilterRequest) Marshal() (dAtA []byte, err error) {
@@ -2843,6 +2849,25 @@ func (m *ReadWindowAggregateRequest) MarshalToSizedBuffer(dAtA []byte) (int, err
 	_ = i
 	var l int
 	_ = l
+	if len(m.Aggregate) > 0 {
+		for iNdEx := len(m.Aggregate) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.Aggregate[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintStorageCommon(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x2a
+		}
+	}
+	if m.WindowEvery != 0 {
+		i = encodeVarintStorageCommon(dAtA, i, uint64(m.WindowEvery))
+		i--
+		dAtA[i] = 0x20
+	}
 	if m.Predicate != nil {
 		{
 			size, err := m.Predicate.MarshalToSizedBuffer(dAtA[:i])
@@ -3457,6 +3482,15 @@ func (m *ReadWindowAggregateRequest) Size() (n int) {
 		l = m.Predicate.Size()
 		n += 1 + l + sovStorageCommon(uint64(l))
 	}
+	if m.WindowEvery != 0 {
+		n += 1 + sovStorageCommon(uint64(m.WindowEvery))
+	}
+	if len(m.Aggregate) > 0 {
+		for _, e := range m.Aggregate {
+			l = e.Size()
+			n += 1 + l + sovStorageCommon(uint64(l))
+		}
+	}
 	return n
 }
 
@@ -7363,6 +7397,59 @@ func (m *ReadWindowAggregateRequest) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
+		case 4:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field WindowEvery", wireType)
+			}
+			m.WindowEvery = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowStorageCommon
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.WindowEvery |= int64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 5:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Aggregate", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowStorageCommon
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthStorageCommon
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthStorageCommon
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Aggregate = append(m.Aggregate, &Aggregate{})
+			if err := m.Aggregate[len(m.Aggregate)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipStorageCommon(dAtA[iNdEx:])
diff --git a/storage/reads/datatypes/storage_common.proto b/storage/reads/datatypes/storage_common.proto
index 8d2751580b..50dd006050 100644
--- a/storage/reads/datatypes/storage_common.proto
+++ b/storage/reads/datatypes/storage_common.proto
@@ -246,5 +246,6 @@ message ReadWindowAggregateRequest {
   google.protobuf.Any read_source = 1 [(gogoproto.customname) = "ReadSource"];
   TimestampRange range = 2 [(gogoproto.nullable) = false];
   Predicate predicate = 3;
-  // TODO(issue #17784): add attributes for the window aggregate request.
+  int64 WindowEvery = 4;
+  repeated Aggregate aggregate = 5;
 }