diff --git a/examples/clients/abe/a_bit_of_everything_service_api.go b/examples/clients/abe/a_bit_of_everything_service_api.go
index d66b34f54b2..a9cf948d7ae 100644
--- a/examples/clients/abe/a_bit_of_everything_service_api.go
+++ b/examples/clients/abe/a_bit_of_everything_service_api.go
@@ -501,6 +501,70 @@ func (a ABitOfEverythingServiceApi) Echo3(value string) (*SubStringMessage, *API
 	return successPayload, localVarAPIResponse, err
 }
 
+/**
+ * 
+ *
+ * @param id 
+ * @param body 
+ * @return *ProtobufEmpty
+ */
+func (a ABitOfEverythingServiceApi) GetMessageWithBody(id string, body ExamplepbBody) (*ProtobufEmpty, *APIResponse, error) {
+
+	var localVarHttpMethod = strings.ToUpper("Post")
+	// create path and map variables
+	localVarPath := a.Configuration.BasePath + "/v2/example/withbody/{id}"
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", fmt.Sprintf("%v", id), -1)
+
+	localVarHeaderParams := make(map[string]string)
+	localVarQueryParams := url.Values{}
+	localVarFormParams := make(map[string]string)
+	var localVarPostBody interface{}
+	var localVarFileName string
+	var localVarFileBytes []byte
+	// add default headers if any
+	for key := range a.Configuration.DefaultHeader {
+		localVarHeaderParams[key] = a.Configuration.DefaultHeader[key]
+	}
+
+	// to determine the Content-Type header
+	localVarHttpContentTypes := []string{ "application/json", "application/x-foo-mime",  }
+
+	// set Content-Type header
+	localVarHttpContentType := a.Configuration.APIClient.SelectHeaderContentType(localVarHttpContentTypes)
+	if localVarHttpContentType != "" {
+		localVarHeaderParams["Content-Type"] = localVarHttpContentType
+	}
+	// to determine the Accept header
+	localVarHttpHeaderAccepts := []string{
+		"application/json",
+		"application/x-foo-mime",
+		}
+
+	// set Accept header
+	localVarHttpHeaderAccept := a.Configuration.APIClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+	if localVarHttpHeaderAccept != "" {
+		localVarHeaderParams["Accept"] = localVarHttpHeaderAccept
+	}
+	// body params
+	localVarPostBody = &body
+	var successPayload = new(ProtobufEmpty)
+	localVarHttpResponse, err := a.Configuration.APIClient.CallAPI(localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes)
+
+	var localVarURL, _ = url.Parse(localVarPath)
+	localVarURL.RawQuery = localVarQueryParams.Encode()
+	var localVarAPIResponse = &APIResponse{Operation: "GetMessageWithBody", Method: localVarHttpMethod, RequestURL: localVarURL.String()}
+	if localVarHttpResponse != nil {
+		localVarAPIResponse.Response = localVarHttpResponse.RawResponse
+		localVarAPIResponse.Payload = localVarHttpResponse.Body()
+	}
+
+	if err != nil {
+		return successPayload, localVarAPIResponse, err
+	}
+	err = json.Unmarshal(localVarHttpResponse.Body(), &successPayload)
+	return successPayload, localVarAPIResponse, err
+}
+
 /**
  * 
  *
diff --git a/examples/clients/abe/api_client.go b/examples/clients/abe/api_client.go
index bf3e21a9fb1..fa9083f4804 100644
--- a/examples/clients/abe/api_client.go
+++ b/examples/clients/abe/api_client.go
@@ -18,7 +18,7 @@ import (
 	"strings"
 	"net/url"
 	"io/ioutil"
-	"github.com/go-resty/resty"
+	"gopkg.in/go-resty/resty.v0"
 )
 
 type APIClient struct {
diff --git a/examples/clients/abe/examplepb_body.go b/examples/clients/abe/examplepb_body.go
new file mode 100644
index 00000000000..13f4c2dc1e1
--- /dev/null
+++ b/examples/clients/abe/examplepb_body.go
@@ -0,0 +1,16 @@
+/* 
+ * A Bit of Everything
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * Contact: none@example.com
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+package abe
+
+type ExamplepbBody struct {
+
+	Name string `json:"name,omitempty"`
+}
diff --git a/examples/clients/echo/api_client.go b/examples/clients/echo/api_client.go
index 7a517148026..46d8271aa87 100644
--- a/examples/clients/echo/api_client.go
+++ b/examples/clients/echo/api_client.go
@@ -18,7 +18,7 @@ import (
 	"strings"
 	"net/url"
 	"io/ioutil"
-	"github.com/go-resty/resty"
+	"gopkg.in/go-resty/resty.v0"
 )
 
 type APIClient struct {
diff --git a/examples/examplepb/a_bit_of_everything.pb.go b/examples/examplepb/a_bit_of_everything.pb.go
index 2727fba7b07..7ac85fc900d 100644
--- a/examples/examplepb/a_bit_of_everything.pb.go
+++ b/examples/examplepb/a_bit_of_everything.pb.go
@@ -429,9 +429,51 @@ func (m *ABitOfEverything_Nested) GetOk() ABitOfEverything_Nested_DeepEnum {
 	return ABitOfEverything_Nested_FALSE
 }
 
+type Body struct {
+	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+}
+
+func (m *Body) Reset()                    { *m = Body{} }
+func (m *Body) String() string            { return proto.CompactTextString(m) }
+func (*Body) ProtoMessage()               {}
+func (*Body) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+
+func (m *Body) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+type MessageWithBody struct {
+	Id   string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Data *Body  `protobuf:"bytes,2,opt,name=data" json:"data,omitempty"`
+}
+
+func (m *MessageWithBody) Reset()                    { *m = MessageWithBody{} }
+func (m *MessageWithBody) String() string            { return proto.CompactTextString(m) }
+func (*MessageWithBody) ProtoMessage()               {}
+func (*MessageWithBody) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+
+func (m *MessageWithBody) GetId() string {
+	if m != nil {
+		return m.Id
+	}
+	return ""
+}
+
+func (m *MessageWithBody) GetData() *Body {
+	if m != nil {
+		return m.Data
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*ABitOfEverything)(nil), "grpc.gateway.examples.examplepb.ABitOfEverything")
 	proto.RegisterType((*ABitOfEverything_Nested)(nil), "grpc.gateway.examples.examplepb.ABitOfEverything.Nested")
+	proto.RegisterType((*Body)(nil), "grpc.gateway.examples.examplepb.Body")
+	proto.RegisterType((*MessageWithBody)(nil), "grpc.gateway.examples.examplepb.MessageWithBody")
 	proto.RegisterEnum("grpc.gateway.examples.examplepb.NumericEnum", NumericEnum_name, NumericEnum_value)
 	proto.RegisterEnum("grpc.gateway.examples.examplepb.ABitOfEverything_Nested_DeepEnum", ABitOfEverything_Nested_DeepEnum_name, ABitOfEverything_Nested_DeepEnum_value)
 }
@@ -464,6 +506,7 @@ type ABitOfEverythingServiceClient interface {
 	DeepPathEcho(ctx context.Context, in *ABitOfEverything, opts ...grpc.CallOption) (*ABitOfEverything, error)
 	NoBindings(ctx context.Context, in *google_protobuf2.Duration, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
 	Timeout(ctx context.Context, in *google_protobuf1.Empty, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	GetMessageWithBody(ctx context.Context, in *MessageWithBody, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
 }
 
 type aBitOfEverythingServiceClient struct {
@@ -564,6 +607,15 @@ func (c *aBitOfEverythingServiceClient) Timeout(ctx context.Context, in *google_
 	return out, nil
 }
 
+func (c *aBitOfEverythingServiceClient) GetMessageWithBody(ctx context.Context, in *MessageWithBody, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
+	out := new(google_protobuf1.Empty)
+	err := grpc.Invoke(ctx, "/grpc.gateway.examples.examplepb.ABitOfEverythingService/GetMessageWithBody", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // Server API for ABitOfEverythingService service
 
 type ABitOfEverythingServiceServer interface {
@@ -584,6 +636,7 @@ type ABitOfEverythingServiceServer interface {
 	DeepPathEcho(context.Context, *ABitOfEverything) (*ABitOfEverything, error)
 	NoBindings(context.Context, *google_protobuf2.Duration) (*google_protobuf1.Empty, error)
 	Timeout(context.Context, *google_protobuf1.Empty) (*google_protobuf1.Empty, error)
+	GetMessageWithBody(context.Context, *MessageWithBody) (*google_protobuf1.Empty, error)
 }
 
 func RegisterABitOfEverythingServiceServer(s *grpc.Server, srv ABitOfEverythingServiceServer) {
@@ -770,6 +823,24 @@ func _ABitOfEverythingService_Timeout_Handler(srv interface{}, ctx context.Conte
 	return interceptor(ctx, in, info, handler)
 }
 
+func _ABitOfEverythingService_GetMessageWithBody_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MessageWithBody)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ABitOfEverythingServiceServer).GetMessageWithBody(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/grpc.gateway.examples.examplepb.ABitOfEverythingService/GetMessageWithBody",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ABitOfEverythingServiceServer).GetMessageWithBody(ctx, req.(*MessageWithBody))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _ABitOfEverythingService_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "grpc.gateway.examples.examplepb.ABitOfEverythingService",
 	HandlerType: (*ABitOfEverythingServiceServer)(nil),
@@ -814,6 +885,10 @@ var _ABitOfEverythingService_serviceDesc = grpc.ServiceDesc{
 			MethodName: "Timeout",
 			Handler:    _ABitOfEverythingService_Timeout_Handler,
 		},
+		{
+			MethodName: "GetMessageWithBody",
+			Handler:    _ABitOfEverythingService_GetMessageWithBody_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "examples/examplepb/a_bit_of_everything.proto",
@@ -886,105 +961,110 @@ var _AnotherServiceWithNoBindings_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("examples/examplepb/a_bit_of_everything.proto", fileDescriptor1) }
 
 var fileDescriptor1 = []byte{
-	// 1590 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcf, 0x6f, 0x1b, 0xc5,
-	0x17, 0xcf, 0xd8, 0x89, 0x13, 0x8f, 0xf3, 0xc3, 0x99, 0xb4, 0xa9, 0xeb, 0xe6, 0xfb, 0xcd, 0xd4,
-	0x2d, 0x68, 0x15, 0xe2, 0x5d, 0xe2, 0x56, 0xa8, 0xb5, 0x04, 0xc5, 0x49, 0xdc, 0x1f, 0xa2, 0x4d,
-	0xdb, 0xed, 0x0f, 0xaa, 0xd0, 0x12, 0xad, 0xed, 0xb1, 0xbd, 0x8d, 0x77, 0x67, 0xd9, 0x9d, 0x4d,
-	0x63, 0x19, 0x73, 0xe0, 0x80, 0xd4, 0x6b, 0xb8, 0x21, 0xd1, 0x0b, 0x12, 0x02, 0x09, 0x8e, 0x9c,
-	0x38, 0x70, 0xe7, 0xca, 0x5f, 0x80, 0xc4, 0x1f, 0x82, 0x76, 0x66, 0x77, 0xb3, 0xb6, 0x63, 0xa5,
-	0x4e, 0x51, 0x4f, 0xde, 0x99, 0xf9, 0xbc, 0xcf, 0xe7, 0xbd, 0x37, 0xf3, 0xde, 0x8c, 0xe1, 0x2a,
-	0xd9, 0xd7, 0x0c, 0xab, 0x45, 0x1c, 0xc5, 0xff, 0xb0, 0x2a, 0x8a, 0xb6, 0x53, 0xd1, 0xd9, 0x0e,
-	0xad, 0xef, 0x90, 0x3d, 0x62, 0xb7, 0x59, 0x53, 0x37, 0x1b, 0xb2, 0x65, 0x53, 0x46, 0xd1, 0x72,
-	0xc3, 0xb6, 0xaa, 0x72, 0x43, 0x63, 0xe4, 0x85, 0xd6, 0x96, 0x03, 0x53, 0x39, 0x34, 0xcd, 0x2e,
-	0x35, 0x28, 0x6d, 0xb4, 0x88, 0xa2, 0x59, 0xba, 0xa2, 0x99, 0x26, 0x65, 0x1a, 0xd3, 0xa9, 0xe9,
-	0x08, 0xf3, 0xec, 0x39, 0x7f, 0x95, 0x8f, 0x2a, 0x6e, 0x5d, 0x21, 0x86, 0xc5, 0xda, 0xfe, 0xe2,
-	0xff, 0xfb, 0x17, 0x6b, 0xae, 0xcd, 0xad, 0xfd, 0xf5, 0x6c, 0xe8, 0xa9, 0xe3, 0x56, 0x14, 0x83,
-	0x38, 0x8e, 0xd6, 0x20, 0x01, 0x71, 0x74, 0xad, 0xd0, 0xb7, 0xb8, 0xdc, 0x4f, 0xcc, 0x74, 0x83,
-	0x38, 0x4c, 0x33, 0x2c, 0x1f, 0xb0, 0xca, 0x7f, 0xaa, 0xf9, 0x06, 0x31, 0xf3, 0xce, 0x0b, 0xad,
-	0xd1, 0x20, 0xb6, 0x42, 0x2d, 0xee, 0xf8, 0x60, 0x10, 0xb9, 0xef, 0xd3, 0x30, 0x5d, 0x5a, 0xd7,
-	0xd9, 0xdd, 0x7a, 0x39, 0x4c, 0x0f, 0x7a, 0x06, 0x67, 0x1c, 0xdd, 0x6c, 0xb4, 0xc8, 0x8e, 0x49,
-	0x1c, 0x46, 0x6a, 0x99, 0xb3, 0x18, 0x48, 0xa9, 0xc2, 0x15, 0xf9, 0x98, 0x84, 0xc9, 0xfd, 0x4c,
-	0xf2, 0x16, 0xb7, 0x57, 0xa7, 0x05, 0x9d, 0x18, 0x21, 0x04, 0xc7, 0x5d, 0x57, 0xaf, 0x65, 0x00,
-	0x06, 0x52, 0x52, 0xe5, 0xdf, 0xe8, 0x1e, 0x4c, 0xf8, 0x5a, 0x31, 0x1c, 0x7f, 0x23, 0x2d, 0x9f,
-	0x07, 0x2d, 0xc3, 0x54, 0xbd, 0x45, 0x35, 0xb6, 0xb3, 0xa7, 0xb5, 0x5c, 0x92, 0x89, 0x63, 0x20,
-	0xc5, 0x54, 0xc8, 0xa7, 0x1e, 0x7b, 0x33, 0xe8, 0x3c, 0x9c, 0xae, 0x51, 0xb7, 0xd2, 0x22, 0x3e,
-	0x62, 0x1c, 0x03, 0x09, 0xa8, 0x29, 0x31, 0x27, 0x20, 0xcb, 0x30, 0xa5, 0x9b, 0xec, 0x83, 0xcb,
-	0x3e, 0x62, 0x02, 0x03, 0x29, 0xae, 0x42, 0x3e, 0x15, 0x72, 0xb8, 0x51, 0x44, 0x02, 0x03, 0x69,
-	0x5c, 0x4d, 0xb9, 0x11, 0x88, 0xe0, 0xb8, 0x54, 0xf0, 0x11, 0x93, 0x18, 0x48, 0x13, 0x9c, 0xe3,
-	0x52, 0x41, 0x00, 0x2e, 0xc0, 0x99, 0xba, 0xbe, 0x4f, 0x6a, 0x21, 0xc9, 0x14, 0x06, 0x52, 0x42,
-	0x9d, 0xf6, 0x27, 0x7b, 0x41, 0x21, 0x4f, 0x12, 0x03, 0x69, 0xd2, 0x07, 0x05, 0x4c, 0xff, 0x83,
-	0xb0, 0x42, 0x69, 0xcb, 0x47, 0x40, 0x0c, 0xa4, 0x29, 0x35, 0xe9, 0xcd, 0x84, 0xce, 0x3a, 0xcc,
-	0xd6, 0xcd, 0x86, 0x0f, 0x48, 0xf1, 0xfc, 0xa7, 0xc4, 0x5c, 0x4f, 0x3c, 0xa1, 0xca, 0x0c, 0x06,
-	0xd2, 0x8c, 0x88, 0x27, 0x10, 0xf9, 0x04, 0x42, 0x62, 0xba, 0x86, 0x0f, 0x98, 0xc5, 0x40, 0x9a,
-	0x2d, 0xac, 0x1e, 0xbb, 0x5b, 0x5b, 0xae, 0x41, 0x6c, 0xbd, 0x5a, 0x36, 0x5d, 0x43, 0x4d, 0x7a,
-	0xf6, 0x82, 0xec, 0x1d, 0x38, 0xeb, 0xf4, 0xc6, 0x35, 0x87, 0x81, 0x34, 0xa7, 0xce, 0x38, 0x3d,
-	0x81, 0x85, 0xb0, 0x30, 0x47, 0x69, 0x0c, 0xa4, 0x74, 0x00, 0x8b, 0xec, 0x86, 0x13, 0xf5, 0x7e,
-	0x1e, 0x03, 0x69, 0x5e, 0x4d, 0x39, 0x11, 0xef, 0x7d, 0x48, 0xc8, 0x83, 0x30, 0x90, 0x90, 0x80,
-	0x04, 0x2c, 0x05, 0x78, 0xda, 0x26, 0x16, 0xd1, 0x18, 0xa9, 0xed, 0xf4, 0xe4, 0x6b, 0x01, 0xc7,
-	0xa5, 0xa4, 0xba, 0x10, 0x2c, 0x3e, 0x88, 0xe4, 0xed, 0x2a, 0x4c, 0x51, 0x93, 0x78, 0x4d, 0xc6,
-	0xeb, 0x01, 0x99, 0x53, 0xbc, 0x5e, 0x16, 0x65, 0x51, 0xab, 0x72, 0x50, 0xab, 0x72, 0xd9, 0x5b,
-	0xbd, 0x39, 0xa6, 0x42, 0x0e, 0xe6, 0x23, 0x74, 0x01, 0x4e, 0x0b, 0x53, 0xa1, 0x95, 0x39, 0xed,
-	0xed, 0xca, 0xcd, 0x31, 0x55, 0x10, 0x0a, 0x11, 0xf4, 0x14, 0x26, 0x0d, 0xcd, 0xf2, 0xfd, 0x58,
-	0xe4, 0x15, 0x72, 0x6d, 0xf4, 0x0a, 0xb9, 0xa3, 0x59, 0xdc, 0xdd, 0xb2, 0xc9, 0xec, 0xb6, 0x3a,
-	0x65, 0xf8, 0x43, 0xb4, 0x0f, 0x17, 0x0c, 0xcd, 0xb2, 0xfa, 0xe3, 0x3d, 0xc3, 0x75, 0x6e, 0x9e,
-	0x48, 0xc7, 0xea, 0xc9, 0x8f, 0x10, 0x9c, 0x37, 0xfa, 0xe7, 0x23, 0xca, 0xa2, 0x6a, 0x7d, 0xe5,
-	0xcc, 0x9b, 0x29, 0x8b, 0x4e, 0x30, 0xa8, 0x1c, 0x99, 0x47, 0x45, 0x98, 0x31, 0xa9, 0xb9, 0x41,
-	0xcd, 0x3d, 0x62, 0x7a, 0x0d, 0x51, 0x6b, 0x6d, 0x69, 0x86, 0x28, 0xfb, 0x4c, 0x96, 0x17, 0xc6,
-	0xd0, 0x75, 0xb4, 0x01, 0xe7, 0xc2, 0xae, 0xeb, 0x7b, 0x7c, 0x8e, 0xef, 0x78, 0x76, 0x60, 0xc7,
-	0x1f, 0x06, 0x38, 0x75, 0x36, 0x34, 0x11, 0x24, 0x4f, 0x61, 0x78, 0x92, 0x76, 0x22, 0x05, 0xb5,
-	0x84, 0xe3, 0x23, 0x17, 0xd4, 0x7c, 0x40, 0x54, 0x0e, 0x0a, 0x2b, 0xfb, 0x13, 0x80, 0x89, 0xc3,
-	0x76, 0x6b, 0x6a, 0x06, 0x09, 0xda, 0xad, 0xf7, 0x8d, 0x16, 0x61, 0x42, 0x33, 0xa8, 0x6b, 0xb2,
-	0x4c, 0x8c, 0x57, 0xb8, 0x3f, 0x42, 0xf7, 0x61, 0x8c, 0xee, 0xf2, 0x5e, 0x39, 0x5b, 0x28, 0x9d,
-	0xb4, 0x05, 0xcb, 0x9b, 0x84, 0x58, 0xdc, 0xb1, 0x18, 0xdd, 0xcd, 0x2d, 0xc3, 0xa9, 0x60, 0x8c,
-	0x92, 0x70, 0xe2, 0x7a, 0xe9, 0xf6, 0x83, 0x72, 0x7a, 0x0c, 0x4d, 0xc1, 0xf1, 0x87, 0xea, 0xa3,
-	0x72, 0x1a, 0x64, 0x75, 0x38, 0xd3, 0x73, 0x30, 0x51, 0x1a, 0xc6, 0x77, 0x49, 0xdb, 0xf7, 0xd7,
-	0xfb, 0x44, 0xeb, 0x70, 0x42, 0x64, 0x27, 0x76, 0x82, 0x76, 0x23, 0x4c, 0x8b, 0xb1, 0x2b, 0x20,
-	0xbb, 0x09, 0x17, 0x8f, 0x3e, 0x9b, 0x47, 0x68, 0x9e, 0x8a, 0x6a, 0x26, 0xa3, 0x2c, 0x5f, 0x05,
-	0x2c, 0xfd, 0xe7, 0xec, 0x08, 0x96, 0xad, 0x28, 0xcb, 0x9b, 0x5c, 0x6b, 0x87, 0xfa, 0xc5, 0xcf,
-	0x0e, 0x4a, 0x4f, 0x56, 0x1e, 0xc3, 0x8b, 0xd7, 0x75, 0xb3, 0x86, 0xa9, 0xcb, 0xb0, 0x41, 0x6d,
-	0x82, 0xb5, 0x8a, 0xf7, 0x39, 0x70, 0x97, 0xcb, 0x4d, 0xc6, 0x2c, 0xa7, 0xa8, 0x28, 0x0d, 0x9d,
-	0x35, 0xdd, 0x8a, 0x5c, 0xa5, 0x86, 0xe2, 0xf9, 0x90, 0x27, 0x55, 0xea, 0xb4, 0x1d, 0x46, 0xfc,
-	0xa1, 0xef, 0xd2, 0xfa, 0x4c, 0xd0, 0xc9, 0xb8, 0xde, 0x0a, 0x86, 0xa9, 0x48, 0x2e, 0xbd, 0x5d,
-	0xdb, 0x2e, 0xab, 0x77, 0xd3, 0x63, 0x68, 0x12, 0xc6, 0xef, 0x6e, 0x95, 0xd3, 0xa0, 0xf0, 0xe7,
-	0x1c, 0x3c, 0xd3, 0xaf, 0xfa, 0x80, 0xd8, 0x7b, 0x7a, 0x95, 0xa0, 0x57, 0x71, 0x98, 0xd8, 0xb0,
-	0xbd, 0xa3, 0x89, 0xd6, 0x46, 0x8e, 0x3c, 0x3b, 0xba, 0x49, 0xee, 0xd7, 0xd8, 0xd7, 0x7f, 0xfd,
-	0xf3, 0x6d, 0xec, 0xc7, 0x58, 0xee, 0x87, 0x98, 0xb2, 0xb7, 0x16, 0x3c, 0x03, 0x8f, 0x7a, 0x04,
-	0x2a, 0x9d, 0xc8, 0xf3, 0xa0, 0xab, 0x74, 0xa2, 0x6f, 0x81, 0xae, 0xd2, 0x89, 0x5c, 0x12, 0x5d,
-	0xc5, 0x21, 0x96, 0x66, 0x6b, 0x8c, 0xda, 0x4a, 0xc7, 0xed, 0x59, 0xe8, 0x44, 0xae, 0x9b, 0xae,
-	0xd2, 0xe9, 0xb9, 0xa3, 0x82, 0x71, 0x64, 0xfd, 0xf0, 0x76, 0xee, 0x2a, 0x9d, 0x68, 0xaf, 0xfd,
-	0xd0, 0x61, 0xb6, 0x65, 0x93, 0xba, 0xbe, 0xaf, 0xac, 0x74, 0x85, 0x48, 0xc4, 0xcc, 0xe9, 0xe7,
-	0x71, 0xfa, 0x85, 0x9c, 0x3e, 0x83, 0x5e, 0x27, 0x87, 0x35, 0xb2, 0x2e, 0x7a, 0x05, 0x20, 0x14,
-	0x1b, 0xb4, 0x4e, 0x6b, 0xed, 0xb7, 0xb4, 0x49, 0x2b, 0x7c, 0x8f, 0x2e, 0xe6, 0x96, 0x8f, 0xd9,
-	0xa1, 0x22, 0x58, 0x41, 0x5f, 0xc2, 0xc4, 0x6d, 0x4a, 0x77, 0x5d, 0x0b, 0xcd, 0xc9, 0xde, 0x6b,
-	0x58, 0xbe, 0x55, 0xbb, 0x23, 0xde, 0xc3, 0x27, 0x51, 0x96, 0xb9, 0xb2, 0x84, 0xde, 0x3d, 0xf6,
-	0x6c, 0x78, 0x8f, 0xd2, 0x2e, 0xfa, 0x06, 0xc0, 0xc4, 0x23, 0xab, 0x76, 0xc2, 0xf3, 0x3b, 0xe4,
-	0xfe, 0xcf, 0xad, 0x71, 0x2f, 0xde, 0xcb, 0xbe, 0xa6, 0x17, 0x5e, 0x1a, 0x34, 0x98, 0xd8, 0x24,
-	0x2d, 0xc2, 0xc8, 0x60, 0x1a, 0x86, 0xa9, 0xf8, 0xb1, 0xae, 0xbc, 0x6e, 0xac, 0x7f, 0x03, 0x38,
-	0x75, 0x83, 0xb0, 0xfb, 0x2e, 0xb1, 0xdb, 0xff, 0x65, 0xb4, 0x2f, 0xc1, 0x41, 0x49, 0xcd, 0x6d,
-	0xc1, 0xa5, 0xa3, 0xda, 0x55, 0x28, 0x38, 0x62, 0x9b, 0x7a, 0x02, 0x78, 0x74, 0x32, 0x5a, 0x3d,
-	0x2e, 0xba, 0x2f, 0x3c, 0xfa, 0x20, 0xc6, 0x97, 0x31, 0x38, 0x5e, 0xae, 0x36, 0x29, 0x92, 0x86,
-	0xc4, 0xe7, 0xb8, 0x15, 0x59, 0xdc, 0x0d, 0x41, 0x7a, 0x5f, 0x1b, 0x99, 0xfb, 0x05, 0x1c, 0x94,
-	0xae, 0xe7, 0x36, 0x21, 0xea, 0x0d, 0x94, 0xeb, 0x8d, 0x18, 0x1e, 0x0f, 0xee, 0xd9, 0xf1, 0xc1,
-	0x91, 0x6a, 0x93, 0x2a, 0x1d, 0x51, 0xe6, 0xdb, 0x67, 0x73, 0x69, 0x65, 0xaf, 0x10, 0xe2, 0xbd,
-	0xb5, 0xa2, 0xb8, 0x35, 0xb6, 0x11, 0x1a, 0x58, 0x42, 0xbf, 0x01, 0x38, 0xed, 0x5d, 0xcc, 0xf7,
-	0x34, 0xd6, 0xe4, 0x3e, 0xbe, 0x9d, 0xe2, 0xbf, 0xc6, 0x63, 0xbb, 0x9a, 0xbb, 0x7c, 0xec, 0xb1,
-	0xec, 0xf9, 0x0b, 0x2a, 0x7b, 0xcf, 0x16, 0x5e, 0x0a, 0x25, 0x08, 0xb7, 0xe8, 0xba, 0x6e, 0xd6,
-	0x74, 0xb3, 0xe1, 0xa0, 0xb3, 0x03, 0xa7, 0x6e, 0xd3, 0xff, 0xa3, 0x3d, 0xf4, 0x40, 0x8e, 0xa1,
-	0xc7, 0x70, 0xd2, 0x7b, 0x97, 0x51, 0x97, 0xa1, 0x21, 0xa0, 0xa1, 0xc6, 0xe7, 0xb8, 0xfb, 0xa7,
-	0xd1, 0x42, 0x34, 0x9f, 0x4c, 0x90, 0x65, 0xff, 0x00, 0x07, 0xa5, 0xdf, 0x01, 0xaa, 0x0f, 0xb9,
-	0x0e, 0x71, 0x8d, 0x38, 0x55, 0x5b, 0xe7, 0xff, 0xc5, 0x71, 0x3e, 0x8f, 0x5f, 0x34, 0xf5, 0x6a,
-	0x13, 0x3b, 0x4d, 0xea, 0xb6, 0x6a, 0xd8, 0xa4, 0x0c, 0x57, 0x08, 0x76, 0x1d, 0x52, 0xc3, 0xba,
-	0x89, 0xad, 0x96, 0x56, 0x25, 0x98, 0xd6, 0x31, 0x6b, 0x12, 0x5c, 0xa3, 0x55, 0xd7, 0x20, 0xa6,
-	0xf8, 0xe7, 0x8e, 0xab, 0xd4, 0xf0, 0x06, 0xe7, 0xb3, 0xf7, 0xe1, 0xf2, 0x51, 0x35, 0xe5, 0x6d,
-	0x66, 0x70, 0x01, 0x8f, 0x78, 0xee, 0x0a, 0x9f, 0xc3, 0xa5, 0x92, 0x49, 0x59, 0x93, 0xd8, 0x3e,
-	0xc3, 0xa7, 0x3a, 0x6b, 0x46, 0xd2, 0xfd, 0x51, 0x4f, 0xf2, 0x47, 0x4d, 0xde, 0xd8, 0xfa, 0xcf,
-	0xb1, 0x83, 0xd2, 0x77, 0x31, 0xc4, 0xe0, 0x42, 0x09, 0xaf, 0xeb, 0xcc, 0x0b, 0x30, 0x72, 0x36,
-	0x9e, 0xc0, 0x53, 0x0d, 0xf5, 0xde, 0x46, 0xfe, 0x86, 0xf0, 0x06, 0x5b, 0x36, 0x7d, 0x4e, 0xaa,
-	0x6c, 0xd4, 0x28, 0xb2, 0x69, 0x93, 0x9a, 0xe4, 0x63, 0x7f, 0x77, 0x3c, 0x74, 0x21, 0xbe, 0x26,
-	0xbf, 0xbf, 0x12, 0x07, 0xb1, 0xf1, 0x42, 0x5a, 0xb3, 0xac, 0x96, 0x5e, 0xe5, 0xa9, 0x54, 0x9e,
-	0x3b, 0xd4, 0x2c, 0x2c, 0x46, 0x67, 0xf6, 0xf3, 0x75, 0x4a, 0xf3, 0x86, 0x6e, 0x90, 0xe2, 0x00,
-	0xb2, 0x38, 0x04, 0x69, 0xdf, 0x82, 0x67, 0xee, 0x1c, 0xe6, 0x3f, 0x1a, 0xc2, 0xa8, 0xae, 0x6f,
-	0x27, 0xc3, 0xd2, 0xa9, 0x24, 0x78, 0xf6, 0x2e, 0xfd, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x88, 0x7d,
-	0xbe, 0x6f, 0xd5, 0x12, 0x00, 0x00,
+	// 1671 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4d, 0x6f, 0xdb, 0xc8,
+	0x19, 0xf6, 0x50, 0x8a, 0x62, 0xbd, 0xf2, 0x87, 0x32, 0x4e, 0x1c, 0x45, 0x49, 0xeb, 0x89, 0x76,
+	0xb7, 0x25, 0xdc, 0x88, 0xdc, 0x28, 0x8b, 0x62, 0x23, 0xa0, 0xdd, 0xca, 0xb1, 0x92, 0x2c, 0xba,
+	0x71, 0x12, 0x66, 0x37, 0x0d, 0xdc, 0x6c, 0x0d, 0x4a, 0x1c, 0x49, 0x5c, 0x8b, 0x1c, 0x96, 0x1c,
+	0xda, 0x16, 0x54, 0xf5, 0xd0, 0x43, 0x8b, 0xbd, 0xba, 0xb7, 0x02, 0xdd, 0x4b, 0x81, 0xa2, 0x05,
+	0xda, 0x63, 0x4f, 0x3d, 0xf4, 0x47, 0xb4, 0x7f, 0xa0, 0x40, 0x7f, 0x48, 0xc1, 0xe1, 0x87, 0x29,
+	0xc9, 0x82, 0x22, 0x67, 0x91, 0x93, 0x39, 0x33, 0xef, 0xfb, 0x3c, 0xef, 0xf7, 0x8c, 0x05, 0x77,
+	0xe8, 0x89, 0x6e, 0x39, 0x7d, 0xea, 0xa9, 0xd1, 0x87, 0xd3, 0x52, 0xf5, 0x83, 0x96, 0xc9, 0x0f,
+	0x58, 0xe7, 0x80, 0x1e, 0x51, 0x77, 0xc0, 0x7b, 0xa6, 0xdd, 0x55, 0x1c, 0x97, 0x71, 0x86, 0xb7,
+	0xba, 0xae, 0xd3, 0x56, 0xba, 0x3a, 0xa7, 0xc7, 0xfa, 0x40, 0x89, 0x55, 0x95, 0x44, 0xb5, 0x7c,
+	0xab, 0xcb, 0x58, 0xb7, 0x4f, 0x55, 0xdd, 0x31, 0x55, 0xdd, 0xb6, 0x19, 0xd7, 0xb9, 0xc9, 0x6c,
+	0x2f, 0x54, 0x2f, 0xdf, 0x8c, 0x4e, 0xc5, 0xaa, 0xe5, 0x77, 0x54, 0x6a, 0x39, 0x7c, 0x10, 0x1d,
+	0x7e, 0x77, 0xf2, 0xd0, 0xf0, 0x5d, 0xa1, 0x1d, 0x9d, 0x97, 0x13, 0x4b, 0x3d, 0xbf, 0xa5, 0x5a,
+	0xd4, 0xf3, 0xf4, 0x2e, 0x8d, 0x81, 0xd3, 0x67, 0xb5, 0x89, 0xc3, 0xad, 0x49, 0x60, 0x6e, 0x5a,
+	0xd4, 0xe3, 0xba, 0xe5, 0x44, 0x02, 0x77, 0xc4, 0x9f, 0x76, 0xb5, 0x4b, 0xed, 0xaa, 0x77, 0xac,
+	0x77, 0xbb, 0xd4, 0x55, 0x99, 0x23, 0x0c, 0x9f, 0x76, 0xa2, 0xf2, 0xc7, 0x22, 0x14, 0x1b, 0x3b,
+	0x26, 0x7f, 0xda, 0x69, 0x26, 0xe1, 0xc1, 0x5f, 0xc2, 0xaa, 0x67, 0xda, 0xdd, 0x3e, 0x3d, 0xb0,
+	0xa9, 0xc7, 0xa9, 0x51, 0xba, 0x41, 0x90, 0x5c, 0xa8, 0x7d, 0xac, 0xcc, 0x09, 0x98, 0x32, 0x89,
+	0xa4, 0xec, 0x09, 0x7d, 0x6d, 0x25, 0x84, 0x0b, 0x57, 0x18, 0x43, 0xd6, 0xf7, 0x4d, 0xa3, 0x84,
+	0x08, 0x92, 0xf3, 0x9a, 0xf8, 0xc6, 0xcf, 0x20, 0x17, 0x71, 0x49, 0x24, 0xf3, 0x56, 0x5c, 0x11,
+	0x0e, 0xde, 0x82, 0x42, 0xa7, 0xcf, 0x74, 0x7e, 0x70, 0xa4, 0xf7, 0x7d, 0x5a, 0xca, 0x10, 0x24,
+	0x4b, 0x1a, 0x88, 0xad, 0x97, 0xc1, 0x0e, 0xbe, 0x0d, 0x2b, 0x06, 0xf3, 0x5b, 0x7d, 0x1a, 0x49,
+	0x64, 0x09, 0x92, 0x91, 0x56, 0x08, 0xf7, 0x42, 0x91, 0x2d, 0x28, 0x98, 0x36, 0xff, 0xe1, 0x47,
+	0x91, 0xc4, 0x25, 0x82, 0xe4, 0x8c, 0x06, 0x62, 0x2b, 0xc1, 0xf0, 0xd3, 0x12, 0x39, 0x82, 0xe4,
+	0xac, 0x56, 0xf0, 0x53, 0x22, 0x21, 0xc6, 0xbd, 0x5a, 0x24, 0x71, 0x99, 0x20, 0xf9, 0x92, 0xc0,
+	0xb8, 0x57, 0x0b, 0x05, 0xde, 0x83, 0xd5, 0x8e, 0x79, 0x42, 0x8d, 0x04, 0x64, 0x99, 0x20, 0x39,
+	0xa7, 0xad, 0x44, 0x9b, 0xe3, 0x42, 0x09, 0x4e, 0x9e, 0x20, 0xf9, 0x72, 0x24, 0x14, 0x23, 0x7d,
+	0x07, 0xa0, 0xc5, 0x58, 0x3f, 0x92, 0x00, 0x82, 0xe4, 0x65, 0x2d, 0x1f, 0xec, 0x24, 0xc6, 0x7a,
+	0xdc, 0x35, 0xed, 0x6e, 0x24, 0x50, 0x10, 0xf1, 0x2f, 0x84, 0x7b, 0x63, 0xfe, 0x24, 0x2c, 0xab,
+	0x04, 0xc9, 0xab, 0xa1, 0x3f, 0x31, 0xc9, 0x4f, 0x01, 0xa8, 0xed, 0x5b, 0x91, 0xc0, 0x1a, 0x41,
+	0xf2, 0x5a, 0xed, 0xce, 0xdc, 0x6c, 0xed, 0xf9, 0x16, 0x75, 0xcd, 0x76, 0xd3, 0xf6, 0x2d, 0x2d,
+	0x1f, 0xe8, 0x87, 0x60, 0x1f, 0xc0, 0x9a, 0x37, 0xee, 0xd7, 0x3a, 0x41, 0xf2, 0xba, 0xb6, 0xea,
+	0x8d, 0x39, 0x96, 0x88, 0x25, 0x31, 0x2a, 0x12, 0x24, 0x17, 0x63, 0xb1, 0x54, 0x36, 0xbc, 0xb4,
+	0xf5, 0x57, 0x08, 0x92, 0xaf, 0x68, 0x05, 0x2f, 0x65, 0x7d, 0x24, 0x92, 0xe0, 0x60, 0x82, 0x64,
+	0x1c, 0x8a, 0xc4, 0x28, 0x35, 0xb8, 0xe6, 0x52, 0x87, 0xea, 0x9c, 0x1a, 0x07, 0x63, 0xf1, 0xda,
+	0x20, 0x19, 0x39, 0xaf, 0x6d, 0xc4, 0x87, 0x2f, 0x52, 0x71, 0xbb, 0x0f, 0x05, 0x66, 0xd3, 0x60,
+	0xc8, 0x04, 0x33, 0xa0, 0x74, 0x55, 0xf4, 0xcb, 0xa6, 0x12, 0xf6, 0xaa, 0x12, 0xf7, 0xaa, 0xd2,
+	0x0c, 0x4e, 0x1f, 0x2f, 0x69, 0x20, 0x84, 0xc5, 0x0a, 0xbf, 0x07, 0x2b, 0xa1, 0x6a, 0xc8, 0x55,
+	0xba, 0x16, 0x64, 0xe5, 0xf1, 0x92, 0x16, 0x02, 0x86, 0x24, 0xf8, 0x35, 0xe4, 0x2d, 0xdd, 0x89,
+	0xec, 0xd8, 0x14, 0x1d, 0xf2, 0xc9, 0xe2, 0x1d, 0xf2, 0x44, 0x77, 0x84, 0xb9, 0x4d, 0x9b, 0xbb,
+	0x03, 0x6d, 0xd9, 0x8a, 0x96, 0xf8, 0x04, 0x36, 0x2c, 0xdd, 0x71, 0x26, 0xfd, 0xbd, 0x2e, 0x78,
+	0x1e, 0x5f, 0x88, 0xc7, 0x19, 0x8b, 0x4f, 0x48, 0x78, 0xc5, 0x9a, 0xdc, 0x4f, 0x31, 0x87, 0x5d,
+	0x1b, 0x31, 0x97, 0xde, 0x8e, 0x39, 0x9c, 0x04, 0xd3, 0xcc, 0xa9, 0x7d, 0x5c, 0x87, 0x92, 0xcd,
+	0xec, 0x07, 0xcc, 0x3e, 0xa2, 0x76, 0x30, 0x10, 0xf5, 0xfe, 0x9e, 0x6e, 0x85, 0x6d, 0x5f, 0x2a,
+	0x8b, 0xc6, 0x98, 0x79, 0x8e, 0x1f, 0xc0, 0x7a, 0x32, 0x75, 0x23, 0x8b, 0x6f, 0x8a, 0x8c, 0x97,
+	0xa7, 0x32, 0xfe, 0x79, 0x2c, 0xa7, 0xad, 0x25, 0x2a, 0x21, 0xc8, 0x6b, 0x48, 0x2a, 0xe9, 0x20,
+	0xd5, 0x50, 0xb7, 0x48, 0x66, 0xe1, 0x86, 0xba, 0x12, 0x03, 0x35, 0xe3, 0xc6, 0x2a, 0xff, 0x05,
+	0x41, 0xee, 0x6c, 0xdc, 0xda, 0xba, 0x45, 0xe3, 0x71, 0x1b, 0x7c, 0xe3, 0x4d, 0xc8, 0xe9, 0x16,
+	0xf3, 0x6d, 0x5e, 0x92, 0x44, 0x87, 0x47, 0x2b, 0xfc, 0x1c, 0x24, 0x76, 0x28, 0x66, 0xe5, 0x5a,
+	0xad, 0x71, 0xd1, 0x11, 0xac, 0xec, 0x52, 0xea, 0x08, 0xc3, 0x24, 0x76, 0x58, 0xd9, 0x82, 0xe5,
+	0x78, 0x8d, 0xf3, 0x70, 0xe9, 0x61, 0xe3, 0xb3, 0x17, 0xcd, 0xe2, 0x12, 0x5e, 0x86, 0xec, 0xe7,
+	0xda, 0x17, 0xcd, 0x22, 0x2a, 0x9b, 0xb0, 0x3a, 0x56, 0x98, 0xb8, 0x08, 0x99, 0x43, 0x3a, 0x88,
+	0xec, 0x0d, 0x3e, 0xf1, 0x0e, 0x5c, 0x0a, 0xa3, 0x23, 0x5d, 0x60, 0xdc, 0x84, 0xaa, 0x75, 0xe9,
+	0x63, 0x54, 0xde, 0x85, 0xcd, 0xf3, 0x6b, 0xf3, 0x1c, 0xce, 0xab, 0x69, 0xce, 0x7c, 0x1a, 0xe5,
+	0xd7, 0x31, 0xca, 0x64, 0x9d, 0x9d, 0x83, 0xb2, 0x97, 0x46, 0x79, 0x9b, 0x6b, 0xed, 0x8c, 0xbf,
+	0xfe, 0xf3, 0xd3, 0xc6, 0xab, 0xed, 0x97, 0xf0, 0xfe, 0x43, 0xd3, 0x36, 0x08, 0xf3, 0x39, 0xb1,
+	0x98, 0x4b, 0x89, 0xde, 0x0a, 0x3e, 0xa7, 0xee, 0x72, 0xa5, 0xc7, 0xb9, 0xe3, 0xd5, 0x55, 0xb5,
+	0x6b, 0xf2, 0x9e, 0xdf, 0x52, 0xda, 0xcc, 0x52, 0x03, 0x1b, 0xaa, 0xb4, 0xcd, 0xbc, 0x81, 0xc7,
+	0x69, 0xb4, 0x8c, 0x4c, 0xda, 0x59, 0x8d, 0x27, 0x99, 0xe0, 0xab, 0x94, 0x21, 0xbb, 0xc3, 0x8c,
+	0xc1, 0x79, 0x45, 0x54, 0x79, 0x0d, 0xeb, 0x4f, 0xc2, 0xb7, 0xc9, 0xcf, 0x4c, 0xde, 0x13, 0x62,
+	0x6b, 0x20, 0x25, 0x17, 0xbb, 0x64, 0x1a, 0xf8, 0x3e, 0x64, 0x0d, 0x9d, 0xeb, 0x91, 0xf7, 0x1f,
+	0xcc, 0xf5, 0x3e, 0x00, 0xd1, 0x84, 0xca, 0x36, 0x81, 0x42, 0x2a, 0x8b, 0x41, 0xbd, 0xec, 0x37,
+	0xb5, 0xa7, 0xc5, 0x25, 0x7c, 0x19, 0x32, 0x4f, 0xf7, 0x9a, 0x45, 0x54, 0xfb, 0x4f, 0x11, 0xae,
+	0x4f, 0xfa, 0xfb, 0x82, 0xba, 0x47, 0x66, 0x9b, 0xe2, 0x6f, 0x32, 0x90, 0x7b, 0xe0, 0x06, 0x4d,
+	0x81, 0xef, 0x2e, 0x1c, 0xf3, 0xf2, 0xe2, 0x2a, 0x95, 0xbf, 0x4b, 0xbf, 0xf9, 0xf7, 0xff, 0x7e,
+	0x2f, 0xfd, 0x59, 0xaa, 0xfc, 0x49, 0x52, 0x8f, 0xee, 0xc6, 0x0f, 0xd0, 0xf3, 0x9e, 0x9f, 0xea,
+	0x30, 0xf5, 0x30, 0x19, 0xa9, 0xc3, 0xf4, 0x2b, 0x64, 0xa4, 0x0e, 0x53, 0xd7, 0xd3, 0x48, 0xf5,
+	0xa8, 0xa3, 0xbb, 0x3a, 0x67, 0xae, 0x3a, 0xf4, 0xc7, 0x0e, 0x86, 0xa9, 0x8b, 0x6e, 0xa4, 0x0e,
+	0xc7, 0x6e, 0xc7, 0x78, 0x9d, 0x3a, 0x3f, 0x7b, 0x17, 0x8c, 0xd4, 0x61, 0x7a, 0xca, 0xff, 0xc8,
+	0xe3, 0xae, 0xe3, 0xd2, 0x8e, 0x79, 0xa2, 0x6e, 0x8f, 0x42, 0x92, 0x94, 0x9a, 0x37, 0x89, 0xe3,
+	0x4d, 0x12, 0x79, 0x13, 0x0a, 0xe3, 0x46, 0xce, 0x1a, 0xa1, 0x23, 0xfc, 0x0d, 0x02, 0x08, 0x13,
+	0x24, 0x0a, 0xe7, 0xdd, 0x24, 0x69, 0x5b, 0xe4, 0xe8, 0xfd, 0xca, 0xd6, 0x9c, 0x0c, 0xd5, 0xd1,
+	0x36, 0xfe, 0x15, 0xe4, 0x3e, 0x63, 0xec, 0xd0, 0x77, 0xf0, 0xba, 0x12, 0xbc, 0xc3, 0x95, 0x4f,
+	0x8d, 0xa8, 0xda, 0x2f, 0xc2, 0xac, 0x08, 0x66, 0x19, 0x7f, 0x6f, 0x6e, 0x6d, 0x04, 0xcf, 0xe1,
+	0x11, 0xfe, 0x2d, 0x82, 0xdc, 0x17, 0x8e, 0x71, 0xc1, 0xfa, 0x9d, 0xf1, 0xf2, 0xa8, 0xdc, 0x15,
+	0x56, 0xfc, 0xa0, 0xfc, 0x86, 0x56, 0x04, 0x61, 0xd0, 0x21, 0xb7, 0x4b, 0xfb, 0x94, 0xd3, 0xe9,
+	0x30, 0xcc, 0x62, 0x89, 0x7c, 0xdd, 0x7e, 0x53, 0x5f, 0xff, 0x8b, 0x60, 0xf9, 0x11, 0xe5, 0xcf,
+	0x7d, 0xea, 0x0e, 0xbe, 0x4d, 0x6f, 0xbf, 0x46, 0xa7, 0x0d, 0xad, 0xb2, 0x07, 0xb7, 0xce, 0x1b,
+	0x94, 0x09, 0xe1, 0x82, 0x03, 0xf2, 0x15, 0x12, 0xde, 0x29, 0xf8, 0xce, 0x3c, 0xef, 0x7e, 0x19,
+	0xc0, 0xc7, 0x3e, 0x7e, 0x2d, 0x41, 0xb6, 0xd9, 0xee, 0x31, 0x2c, 0xcf, 0xf0, 0xcf, 0xf3, 0x5b,
+	0x4a, 0x78, 0x2b, 0xc5, 0xe1, 0x7d, 0x63, 0xc9, 0xca, 0xdf, 0xd0, 0x69, 0xe3, 0x61, 0x65, 0x17,
+	0xf0, 0xb8, 0xa3, 0x82, 0x6f, 0x41, 0xf7, 0x84, 0x73, 0x5f, 0xce, 0x77, 0x8e, 0xb6, 0x7b, 0x4c,
+	0x1d, 0x86, 0x6d, 0xbe, 0x7f, 0xa3, 0x52, 0x54, 0x8f, 0x6a, 0x89, 0x7c, 0x70, 0x56, 0x0f, 0xef,
+	0xab, 0x7d, 0x8c, 0xa7, 0x8e, 0xf0, 0x3f, 0x10, 0xac, 0x04, 0x4f, 0x82, 0x67, 0x3a, 0xef, 0x09,
+	0x1b, 0xdf, 0x4d, 0xf3, 0x7f, 0x22, 0x7c, 0xbb, 0x5f, 0xf9, 0x68, 0x6e, 0x59, 0x8e, 0xfd, 0xf3,
+	0xab, 0x04, 0x77, 0x9d, 0x68, 0x85, 0x06, 0xc0, 0x1e, 0xdb, 0x31, 0x6d, 0xc3, 0xb4, 0xbb, 0x1e,
+	0xbe, 0x31, 0x55, 0x75, 0xbb, 0xd1, 0xbf, 0xf8, 0x33, 0x0b, 0x72, 0x09, 0xbf, 0x84, 0xcb, 0xc1,
+	0x8b, 0x90, 0xf9, 0x1c, 0xcf, 0x10, 0x9a, 0xa9, 0x7c, 0x53, 0x98, 0x7f, 0x0d, 0x6f, 0xa4, 0xe3,
+	0xc9, 0x23, 0xb0, 0xdf, 0x21, 0xc0, 0x8f, 0x28, 0x9f, 0xbc, 0x8e, 0x3f, 0x9c, 0x1b, 0xa5, 0x09,
+	0x8d, 0x99, 0xec, 0xdf, 0x17, 0xec, 0xb7, 0x2b, 0x37, 0xd2, 0xec, 0xc7, 0x26, 0xef, 0xb5, 0x98,
+	0x31, 0x50, 0x87, 0xc1, 0xb0, 0x10, 0xd7, 0x76, 0xf9, 0x5f, 0xe8, 0xb4, 0xf1, 0x4f, 0x84, 0x3b,
+	0x33, 0x2e, 0x66, 0x62, 0x50, 0xaf, 0xed, 0x9a, 0xe2, 0xf7, 0x08, 0x52, 0xad, 0x92, 0xe3, 0x9e,
+	0xd9, 0xee, 0x11, 0xaf, 0xc7, 0xfc, 0xbe, 0x41, 0x6c, 0xc6, 0x49, 0x8b, 0x12, 0xdf, 0xa3, 0x06,
+	0x31, 0x6d, 0xe2, 0xf4, 0xf5, 0x36, 0x25, 0xac, 0x43, 0x78, 0x8f, 0x12, 0x83, 0xb5, 0x7d, 0x8b,
+	0xda, 0xe1, 0xaf, 0x17, 0xa4, 0xcd, 0xac, 0x60, 0x71, 0xbb, 0xfc, 0x1c, 0xb6, 0xce, 0xeb, 0xee,
+	0xa0, 0xac, 0xe2, 0xa7, 0xc0, 0x82, 0x1d, 0x50, 0xfb, 0x05, 0xdc, 0x6a, 0xd8, 0x8c, 0xf7, 0xa8,
+	0x1b, 0x21, 0x04, 0xc1, 0x49, 0x25, 0xfe, 0xc7, 0x63, 0x65, 0xb0, 0x68, 0x1a, 0x97, 0x76, 0xfe,
+	0x2a, 0x9d, 0x36, 0xfe, 0x20, 0x61, 0x0e, 0x1b, 0x0d, 0xb2, 0x63, 0xf2, 0xc0, 0xc1, 0x54, 0x95,
+	0xbe, 0x82, 0xab, 0x5d, 0xed, 0xd9, 0x83, 0xea, 0xa3, 0xd0, 0x1a, 0xe2, 0xb8, 0xec, 0x2b, 0xda,
+	0xe6, 0x8b, 0x7a, 0x51, 0x2e, 0xda, 0xcc, 0xa6, 0x3f, 0x89, 0x32, 0x15, 0x48, 0xd7, 0x32, 0x77,
+	0x95, 0x0f, 0xb7, 0x33, 0x48, 0xca, 0xd6, 0x8a, 0xba, 0xe3, 0xf4, 0xcd, 0xb6, 0x08, 0xa5, 0xfa,
+	0x95, 0xc7, 0xec, 0xda, 0x66, 0x7a, 0xe7, 0xa4, 0xda, 0x61, 0xac, 0x6a, 0x99, 0x16, 0xad, 0x4f,
+	0x49, 0xd6, 0x67, 0x48, 0xba, 0x9f, 0xc2, 0xf5, 0x27, 0x67, 0xf1, 0x4f, 0xbb, 0xb0, 0xa8, 0xe9,
+	0xfb, 0xf9, 0xa4, 0x3c, 0x5b, 0x39, 0x11, 0xbd, 0x7b, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xd7,
+	0x0d, 0x07, 0x7a, 0xd9, 0x13, 0x00, 0x00,
 }
diff --git a/examples/examplepb/a_bit_of_everything.pb.gw.go b/examples/examplepb/a_bit_of_everything.pb.gw.go
index 25885abd8ef..f1c3ceee88f 100644
--- a/examples/examplepb/a_bit_of_everything.pb.gw.go
+++ b/examples/examplepb/a_bit_of_everything.pb.gw.go
@@ -450,6 +450,37 @@ func request_ABitOfEverythingService_Timeout_0(ctx context.Context, marshaler ru
 
 }
 
+func request_ABitOfEverythingService_GetMessageWithBody_0(ctx context.Context, marshaler runtime.Marshaler, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq MessageWithBody
+	var metadata runtime.ServerMetadata
+
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Data); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	var (
+		val string
+		ok  bool
+		err error
+		_   = err
+	)
+
+	val, ok = pathParams["id"]
+	if !ok {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id")
+	}
+
+	protoReq.Id, err = runtime.String(val)
+
+	if err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err)
+	}
+
+	msg, err := client.GetMessageWithBody(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
 // RegisterABitOfEverythingServiceHandlerFromEndpoint is same as RegisterABitOfEverythingServiceHandler but
 // automatically dials to "endpoint" and closes the connection when "ctx" gets done.
 func RegisterABitOfEverythingServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) {
@@ -807,6 +838,35 @@ func RegisterABitOfEverythingServiceHandlerClient(ctx context.Context, mux *runt
 
 	})
 
+	mux.Handle("POST", pattern_ABitOfEverythingService_GetMessageWithBody_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		if cn, ok := w.(http.CloseNotifier); ok {
+			go func(done <-chan struct{}, closed <-chan bool) {
+				select {
+				case <-done:
+				case <-closed:
+					cancel()
+				}
+			}(ctx.Done(), cn.CloseNotify())
+		}
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_ABitOfEverythingService_GetMessageWithBody_0(rctx, inboundMarshaler, client, req, pathParams)
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_ABitOfEverythingService_GetMessageWithBody_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
 	return nil
 }
 
@@ -832,6 +892,8 @@ var (
 	pattern_ABitOfEverythingService_DeepPathEcho_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "example", "a_bit_of_everything", "single_nested.name"}, ""))
 
 	pattern_ABitOfEverythingService_Timeout_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v2", "example", "timeout"}, ""))
+
+	pattern_ABitOfEverythingService_GetMessageWithBody_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v2", "example", "withbody", "id"}, ""))
 )
 
 var (
@@ -856,4 +918,6 @@ var (
 	forward_ABitOfEverythingService_DeepPathEcho_0 = runtime.ForwardResponseMessage
 
 	forward_ABitOfEverythingService_Timeout_0 = runtime.ForwardResponseMessage
+
+	forward_ABitOfEverythingService_GetMessageWithBody_0 = runtime.ForwardResponseMessage
 )
diff --git a/examples/examplepb/a_bit_of_everything.proto b/examples/examplepb/a_bit_of_everything.proto
index 6250bdd4381..15d0cd9f6b0 100644
--- a/examples/examplepb/a_bit_of_everything.proto
+++ b/examples/examplepb/a_bit_of_everything.proto
@@ -97,6 +97,16 @@ message ABitOfEverything {
 	repeated NumericEnum repeated_enum_value = 28;
 }
 
+message Body {
+	string name = 1;
+}
+
+message MessageWithBody {
+	string id = 1;
+	Body data = 2;
+}
+
+
 // NumericEnum is one or zero.
 enum NumericEnum {
 	// ZERO means 0
@@ -194,6 +204,12 @@ service ABitOfEverythingService {
 			get: "/v2/example/timeout",
 		};
 	}
+	rpc GetMessageWithBody(MessageWithBody) returns (google.protobuf.Empty) {
+		option (google.api.http) = {
+			post: "/v2/example/withbody/{id}",
+			body: "data"
+		};
+	}
 }
 
 service AnotherServiceWithNoBindings {
diff --git a/examples/examplepb/a_bit_of_everything.swagger.json b/examples/examplepb/a_bit_of_everything.swagger.json
index c42cd34ed13..4efff4bebb6 100644
--- a/examples/examplepb/a_bit_of_everything.swagger.json
+++ b/examples/examplepb/a_bit_of_everything.swagger.json
@@ -590,6 +590,38 @@
           "ABitOfEverythingService"
         ]
       }
+    },
+    "/v2/example/withbody/{id}": {
+      "post": {
+        "operationId": "GetMessageWithBody",
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/protobufEmpty"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/examplepbBody"
+            }
+          }
+        ],
+        "tags": [
+          "ABitOfEverythingService"
+        ]
+      }
     }
   },
   "definitions": {
diff --git a/examples/examplepb/echo_service.pb.go b/examples/examplepb/echo_service.pb.go
index f4b5f3b5caa..0cca760395b 100644
--- a/examples/examplepb/echo_service.pb.go
+++ b/examples/examplepb/echo_service.pb.go
@@ -18,6 +18,8 @@ It is generated from these files:
 It has these top-level messages:
 	SimpleMessage
 	ABitOfEverything
+	Body
+	MessageWithBody
 	EmptyProto
 	NonEmptyProto
 	UnaryProto