diff --git a/lnrpc/routerrpc/router.pb.go b/lnrpc/routerrpc/router.pb.go
index aa473918a..7d454125c 100644
--- a/lnrpc/routerrpc/router.pb.go
+++ b/lnrpc/routerrpc/router.pb.go
@@ -247,6 +247,8 @@ type SendPaymentRequest struct {
 	//The CLTV delta from the current height that should be used to set the
 	//timelock for the final hop.
 	FinalCltvDelta int32 `protobuf:"varint,4,opt,name=final_cltv_delta,json=finalCltvDelta,proto3" json:"final_cltv_delta,omitempty"`
+	// An optional payment addr to be included within the last hop of the route.
+	PaymentAddr []byte `protobuf:"bytes,20,opt,name=payment_addr,json=paymentAddr,proto3" json:"payment_addr,omitempty"`
 	//
 	//A bare-bones invoice for a payment within the Lightning Network.  With the
 	//details of the invoice, the sender has all the data necessary to send a
@@ -386,6 +388,13 @@ func (m *SendPaymentRequest) GetFinalCltvDelta() int32 {
 	return 0
 }
 
+func (m *SendPaymentRequest) GetPaymentAddr() []byte {
+	if m != nil {
+		return m.PaymentAddr
+	}
+	return nil
+}
+
 func (m *SendPaymentRequest) GetPaymentRequest() string {
 	if m != nil {
 		return m.PaymentRequest
@@ -2037,171 +2046,171 @@ func init() {
 func init() { proto.RegisterFile("routerrpc/router.proto", fileDescriptor_7a0613f69d37b0a5) }
 
 var fileDescriptor_7a0613f69d37b0a5 = []byte{
-	// 2615 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x59, 0x4b, 0x77, 0xdb, 0xc6,
-	0xf5, 0x0f, 0x48, 0x8a, 0x22, 0x2f, 0x1f, 0x82, 0x46, 0x8a, 0xc5, 0x3f, 0x65, 0x27, 0x0c, 0x93,
-	0xd8, 0x3c, 0xfe, 0x27, 0xb2, 0xa2, 0xf6, 0xb4, 0x69, 0xf3, 0x68, 0x28, 0x12, 0xb2, 0x60, 0x53,
-	0x24, 0x33, 0xa4, 0x9c, 0xa4, 0x59, 0x4c, 0x21, 0x62, 0x28, 0xa2, 0x02, 0x01, 0x16, 0x18, 0xda,
-	0xd1, 0xb2, 0xbb, 0x9e, 0x7e, 0x98, 0x7e, 0x82, 0x9e, 0xd3, 0x2e, 0xba, 0xea, 0x97, 0xe8, 0xb6,
-	0xfb, 0x9e, 0xd3, 0x75, 0xcf, 0x3c, 0x00, 0x02, 0x12, 0x65, 0xb7, 0xa7, 0xdd, 0xd8, 0xc4, 0xef,
-	0xde, 0xb9, 0x73, 0xef, 0xdc, 0xe7, 0x8c, 0xe0, 0x5e, 0xe0, 0x2f, 0x19, 0x0d, 0x82, 0xc5, 0xe4,
-	0x89, 0xfc, 0x75, 0xb0, 0x08, 0x7c, 0xe6, 0xa3, 0x62, 0x8c, 0xd7, 0x8b, 0xc1, 0x62, 0x22, 0xd1,
-	0xe6, 0x3f, 0xf2, 0x80, 0x46, 0xd4, 0xb3, 0x87, 0xd6, 0xf5, 0x9c, 0x7a, 0x0c, 0xd3, 0xdf, 0x2c,
-	0x69, 0xc8, 0x10, 0x82, 0x9c, 0x4d, 0x43, 0x56, 0xd3, 0x1a, 0x5a, 0xab, 0x8c, 0xc5, 0x6f, 0xa4,
-	0x43, 0xd6, 0x9a, 0xb3, 0x5a, 0xa6, 0xa1, 0xb5, 0xb2, 0x98, 0xff, 0x44, 0xff, 0x07, 0x05, 0x6b,
-	0xce, 0xc8, 0x3c, 0xb4, 0x58, 0xad, 0x2c, 0xe0, 0x4d, 0x6b, 0xce, 0xce, 0x42, 0x8b, 0xa1, 0xf7,
-	0xa0, 0xbc, 0x90, 0x22, 0xc9, 0xcc, 0x0a, 0x67, 0xb5, 0xac, 0x10, 0x54, 0x52, 0xd8, 0xa9, 0x15,
-	0xce, 0x50, 0x0b, 0xf4, 0xa9, 0xe3, 0x59, 0x2e, 0x99, 0xb8, 0xec, 0x25, 0xb1, 0xa9, 0xcb, 0xac,
-	0x5a, 0xae, 0xa1, 0xb5, 0x36, 0x70, 0x55, 0xe0, 0x1d, 0x97, 0xbd, 0xec, 0x72, 0x14, 0x3d, 0x82,
-	0xad, 0x48, 0x58, 0x20, 0x15, 0xac, 0x6d, 0x34, 0xb4, 0x56, 0x11, 0x57, 0x17, 0x69, 0xb5, 0x1f,
-	0xc1, 0x16, 0x73, 0xe6, 0xd4, 0x5f, 0x32, 0x12, 0xd2, 0x89, 0xef, 0xd9, 0x61, 0x2d, 0x2f, 0x25,
-	0x2a, 0x78, 0x24, 0x51, 0xd4, 0x84, 0xca, 0x94, 0x52, 0xe2, 0x3a, 0x73, 0x87, 0x11, 0xae, 0xfe,
-	0xa6, 0x50, 0xbf, 0x34, 0xa5, 0xb4, 0xc7, 0xb1, 0x91, 0xc5, 0xd0, 0x07, 0x50, 0x5d, 0xf1, 0x08,
-	0x1b, 0x2b, 0x82, 0xa9, 0x1c, 0x31, 0x09, 0x43, 0x0f, 0x40, 0xf7, 0x97, 0xec, 0xd2, 0x77, 0xbc,
-	0x4b, 0x32, 0x99, 0x59, 0x1e, 0x71, 0xec, 0x5a, 0xa1, 0xa1, 0xb5, 0x72, 0xc7, 0xb9, 0x9a, 0x76,
-	0xa8, 0xe1, 0x6a, 0x44, 0xed, 0xcc, 0x2c, 0xcf, 0xb4, 0xd1, 0x63, 0xd8, 0xbe, 0xc9, 0x1f, 0xd6,
-	0x76, 0x1a, 0xd9, 0x56, 0x0e, 0x6f, 0xa5, 0x59, 0x43, 0xf4, 0x10, 0xb6, 0x5c, 0x2b, 0x64, 0x64,
-	0xe6, 0x2f, 0xc8, 0x62, 0x79, 0x71, 0x45, 0xaf, 0x6b, 0x55, 0x71, 0x8e, 0x15, 0x0e, 0x9f, 0xfa,
-	0x8b, 0xa1, 0x00, 0xd1, 0x03, 0x00, 0x71, 0x86, 0x42, 0xd5, 0x5a, 0x51, 0x58, 0x5c, 0xe4, 0x88,
-	0x50, 0x13, 0x7d, 0x02, 0x25, 0xe1, 0x7b, 0x32, 0x73, 0x3c, 0x16, 0xd6, 0xa0, 0x91, 0x6d, 0x95,
-	0x8e, 0xf4, 0x03, 0xd7, 0xe3, 0x61, 0x80, 0x39, 0xe5, 0xd4, 0xf1, 0x18, 0x86, 0x20, 0xfa, 0x19,
-	0x22, 0x1b, 0x76, 0xb8, 0xcf, 0xc9, 0x64, 0x19, 0x32, 0x7f, 0x4e, 0x02, 0x3a, 0xf1, 0x03, 0x3b,
-	0xac, 0x95, 0xc4, 0xd2, 0x1f, 0x1f, 0xc4, 0xa1, 0x74, 0x70, 0x3b, 0x76, 0x0e, 0xba, 0x34, 0x64,
-	0x1d, 0xb1, 0x0e, 0xcb, 0x65, 0x86, 0xc7, 0x82, 0x6b, 0xbc, 0x6d, 0xdf, 0xc4, 0xd1, 0x47, 0x80,
-	0x2c, 0xd7, 0xf5, 0x5f, 0x91, 0x90, 0xba, 0x53, 0xa2, 0x7c, 0x59, 0xdb, 0x6a, 0x68, 0xad, 0x02,
-	0xd6, 0x05, 0x65, 0x44, 0xdd, 0xa9, 0x12, 0x8f, 0x7e, 0x02, 0x15, 0xa1, 0xd3, 0x94, 0x5a, 0x6c,
-	0x19, 0xd0, 0xb0, 0xa6, 0x37, 0xb2, 0xad, 0xea, 0xd1, 0xb6, 0x32, 0xe4, 0x44, 0xc2, 0xc7, 0x0e,
-	0xc3, 0x65, 0xce, 0xa7, 0xbe, 0x43, 0xb4, 0x0f, 0xc5, 0xb9, 0xf5, 0x03, 0x59, 0x58, 0x01, 0x0b,
-	0x6b, 0xdb, 0x0d, 0xad, 0x55, 0xc1, 0x85, 0xb9, 0xf5, 0xc3, 0x90, 0x7f, 0xa3, 0x03, 0xd8, 0xf1,
-	0x7c, 0xe2, 0x78, 0x53, 0xd7, 0xb9, 0x9c, 0x31, 0xb2, 0x5c, 0xd8, 0x16, 0xa3, 0x61, 0x0d, 0x09,
-	0x1d, 0xb6, 0x3d, 0xdf, 0x54, 0x94, 0x73, 0x49, 0xa8, 0x77, 0xe1, 0xde, 0x7a, 0xfb, 0x78, 0x7a,
-	0x70, 0x07, 0xf1, 0x8c, 0xc9, 0x61, 0xfe, 0x13, 0xed, 0xc2, 0xc6, 0x4b, 0xcb, 0x5d, 0x52, 0x91,
-	0x32, 0x65, 0x2c, 0x3f, 0x7e, 0x9e, 0xf9, 0x54, 0x6b, 0xce, 0x60, 0x67, 0x1c, 0x58, 0x93, 0xab,
-	0x1b, 0x59, 0x77, 0x33, 0x69, 0xb4, 0xdb, 0x49, 0x73, 0x87, 0xbe, 0x99, 0x3b, 0xf4, 0x6d, 0x7e,
-	0x09, 0x5b, 0xc2, 0xc3, 0x27, 0x94, 0xbe, 0x2e, 0xb7, 0xf7, 0x80, 0x67, 0xae, 0xc8, 0x04, 0x99,
-	0xdf, 0x79, 0x6b, 0xce, 0x93, 0xa0, 0x69, 0x83, 0xbe, 0x5a, 0x1f, 0x2e, 0x7c, 0x2f, 0xa4, 0x3c,
-	0x71, 0x79, 0x00, 0xf0, 0x08, 0xe6, 0x09, 0x22, 0x52, 0x43, 0x13, 0xab, 0xaa, 0x0a, 0x3f, 0xa1,
-	0x54, 0x24, 0xc7, 0x43, 0x99, 0x8f, 0xc4, 0xf5, 0x27, 0x57, 0x3c, 0xc3, 0xad, 0x6b, 0x25, 0xbe,
-	0xc2, 0xe1, 0x9e, 0x3f, 0xb9, 0xea, 0x72, 0xb0, 0xf9, 0xbd, 0x2c, 0x42, 0x63, 0x5f, 0xec, 0xf5,
-	0x1f, 0x1c, 0x47, 0x13, 0x36, 0x44, 0x2c, 0x0a, 0xb1, 0xa5, 0xa3, 0x72, 0x32, 0xa8, 0xb1, 0x24,
-	0x35, 0xbf, 0x87, 0x9d, 0x94, 0x70, 0x65, 0x45, 0x1d, 0x0a, 0x8b, 0x80, 0x3a, 0x73, 0xeb, 0x92,
-	0x2a, 0xc9, 0xf1, 0x37, 0x6a, 0xc1, 0xe6, 0xd4, 0x72, 0xdc, 0x65, 0x10, 0x09, 0xae, 0x46, 0x41,
-	0x26, 0x51, 0x1c, 0x91, 0x9b, 0xf7, 0xa1, 0x8e, 0x69, 0x48, 0xd9, 0x99, 0x13, 0x86, 0x8e, 0xef,
-	0x75, 0x7c, 0x8f, 0x05, 0xbe, 0xab, 0x2c, 0x68, 0x3e, 0x80, 0xfd, 0xb5, 0x54, 0xa9, 0x02, 0x5f,
-	0xfc, 0xf5, 0x92, 0x06, 0xd7, 0xeb, 0x17, 0x7f, 0x0d, 0xfb, 0x6b, 0xa9, 0x4a, 0xff, 0x8f, 0x60,
-	0x63, 0x61, 0x39, 0x01, 0xf7, 0x3d, 0x4f, 0xca, 0x7b, 0x89, 0xa4, 0x1c, 0x5a, 0x4e, 0x70, 0xea,
-	0x84, 0xcc, 0x0f, 0xae, 0xb1, 0x64, 0x7a, 0x96, 0x2b, 0x68, 0x7a, 0xa6, 0xf9, 0x7b, 0x0d, 0x4a,
-	0x09, 0x22, 0x4f, 0x0d, 0xcf, 0xb7, 0x29, 0x99, 0x06, 0xfe, 0x3c, 0x3a, 0x04, 0x0e, 0x9c, 0x04,
-	0xfe, 0x9c, 0xc7, 0x84, 0x20, 0x32, 0x5f, 0x05, 0x70, 0x9e, 0x7f, 0x8e, 0x7d, 0xf4, 0x31, 0x6c,
-	0xce, 0xa4, 0x00, 0x51, 0x36, 0x4b, 0x47, 0x3b, 0x37, 0xf6, 0xee, 0x5a, 0xcc, 0xc2, 0x11, 0xcf,
-	0xb3, 0x5c, 0x21, 0xab, 0xe7, 0x9e, 0xe5, 0x0a, 0x39, 0x7d, 0xe3, 0x59, 0xae, 0xb0, 0xa1, 0xe7,
-	0x9f, 0xe5, 0x0a, 0x79, 0x7d, 0xb3, 0xf9, 0x77, 0x0d, 0x0a, 0x11, 0x37, 0xd7, 0x84, 0x1f, 0x29,
-	0xe1, 0x71, 0xa1, 0x82, 0xa9, 0xc0, 0x81, 0xb1, 0x33, 0xa7, 0xa8, 0x01, 0x65, 0x41, 0x4c, 0x87,
-	0x28, 0x70, 0xac, 0x2d, 0xc2, 0x54, 0xd4, 0xf3, 0x88, 0x43, 0xc4, 0x63, 0x4e, 0xd5, 0x73, 0xc9,
-	0x12, 0xb5, 0xa4, 0x70, 0x39, 0x99, 0xd0, 0x30, 0x94, 0xbb, 0x6c, 0x48, 0x16, 0x85, 0x89, 0x8d,
-	0x1e, 0xc2, 0x56, 0xc4, 0x12, 0xed, 0x95, 0x97, 0xf1, 0xaa, 0x60, 0xb5, 0x5d, 0x0b, 0xf4, 0x24,
-	0xdf, 0x7c, 0xd5, 0x41, 0xaa, 0x2b, 0x46, 0xbe, 0xa9, 0x34, 0xbe, 0xf9, 0x6b, 0xd8, 0x13, 0xae,
-	0x1c, 0x06, 0xfe, 0x85, 0x75, 0xe1, 0xb8, 0x0e, 0xbb, 0x8e, 0x82, 0x9c, 0x1b, 0x1e, 0xf8, 0x73,
-	0xc2, 0xcf, 0x36, 0x72, 0x01, 0x07, 0xfa, 0xbe, 0x4d, 0xb9, 0x0b, 0x98, 0x2f, 0x49, 0xca, 0x05,
-	0xcc, 0x17, 0x84, 0x64, 0xe7, 0xcd, 0xa6, 0x3a, 0x6f, 0xf3, 0x0a, 0x6a, 0xb7, 0xf7, 0x52, 0x31,
-	0xd3, 0x80, 0xd2, 0x62, 0x05, 0x8b, 0xed, 0x34, 0x9c, 0x84, 0x92, 0xbe, 0xcd, 0xbc, 0xd9, 0xb7,
-	0xcd, 0xbf, 0x6a, 0xb0, 0x7d, 0xbc, 0x74, 0x5c, 0x3b, 0x95, 0xb8, 0x49, 0xed, 0xb4, 0xf4, 0x5c,
-	0xb0, 0xae, 0xe9, 0x67, 0xd6, 0x36, 0xfd, 0x8f, 0xd6, 0x34, 0xd6, 0xac, 0x68, 0xac, 0x99, 0x35,
-	0x6d, 0xf5, 0x5d, 0x28, 0xad, 0xba, 0x64, 0x58, 0xcb, 0x35, 0xb2, 0xad, 0x32, 0x86, 0x59, 0xd4,
-	0x22, 0xc3, 0x64, 0x31, 0xb1, 0x6c, 0x3b, 0x10, 0xde, 0x5f, 0x15, 0x93, 0xb6, 0x6d, 0x07, 0xcd,
-	0x4f, 0x01, 0x25, 0x6d, 0x51, 0x67, 0x16, 0x97, 0x18, 0xed, 0xee, 0x12, 0x73, 0x1f, 0xea, 0xa3,
-	0xe5, 0x45, 0x38, 0x09, 0x9c, 0x0b, 0x7a, 0xca, 0xdc, 0x89, 0xf1, 0x92, 0x7a, 0x2c, 0x8c, 0x12,
-	0xf9, 0x9f, 0x39, 0x28, 0xc6, 0x28, 0xaf, 0xe0, 0x8e, 0x37, 0xf1, 0xe7, 0x91, 0x5d, 0x1e, 0x75,
-	0xb9, 0x69, 0xb2, 0x6f, 0x6c, 0x47, 0xa4, 0x8e, 0xa4, 0x98, 0x36, 0xe7, 0x4f, 0x9d, 0x83, 0xe2,
-	0xcf, 0x48, 0xfe, 0xe4, 0x31, 0x48, 0xfe, 0x16, 0xe8, 0xb1, 0xfc, 0x19, 0x73, 0x27, 0xf1, 0xb9,
-	0xe1, 0x6a, 0x84, 0x73, 0x65, 0x24, 0x67, 0x2c, 0x39, 0xe2, 0xcc, 0x49, 0xce, 0x08, 0x57, 0x9c,
-	0xef, 0x41, 0x99, 0xa7, 0x4c, 0xc8, 0xac, 0xf9, 0x82, 0x78, 0xa1, 0x38, 0xbc, 0x1c, 0x2e, 0xc5,
-	0x58, 0x3f, 0x44, 0x5f, 0x00, 0x50, 0x6e, 0x1f, 0x61, 0xd7, 0x0b, 0x2a, 0xb2, 0xa6, 0x7a, 0xf4,
-	0x4e, 0x22, 0x76, 0xe2, 0x03, 0x38, 0x10, 0xff, 0x8e, 0xaf, 0x17, 0x14, 0x17, 0x69, 0xf4, 0x13,
-	0x7d, 0x09, 0x95, 0xa9, 0x1f, 0xbc, 0xb2, 0x02, 0x9b, 0x08, 0x50, 0x55, 0x96, 0xbd, 0x84, 0x84,
-	0x13, 0x49, 0x17, 0xcb, 0x4f, 0xdf, 0xc2, 0xe5, 0x69, 0xe2, 0x1b, 0x3d, 0x07, 0x14, 0xad, 0x17,
-	0x85, 0x40, 0x0a, 0x29, 0x08, 0x21, 0xfb, 0xb7, 0x85, 0xf0, 0x3a, 0x1e, 0x09, 0xd2, 0xa7, 0x37,
-	0x30, 0xf4, 0x19, 0x94, 0x43, 0xca, 0x98, 0x4b, 0x95, 0x98, 0xa2, 0x10, 0x73, 0x2f, 0x35, 0xf6,
-	0x70, 0x72, 0x24, 0xa1, 0x14, 0xae, 0x3e, 0xd1, 0x31, 0x6c, 0xb9, 0x8e, 0x77, 0x95, 0x54, 0x03,
-	0xc4, 0xfa, 0x5a, 0x62, 0x7d, 0xcf, 0xf1, 0xae, 0x92, 0x3a, 0x54, 0xdc, 0x24, 0xd0, 0xfc, 0x1c,
-	0x8a, 0xf1, 0x29, 0xa1, 0x12, 0x6c, 0x9e, 0xf7, 0x9f, 0xf7, 0x07, 0xdf, 0xf4, 0xf5, 0xb7, 0x50,
-	0x01, 0x72, 0x23, 0xa3, 0xdf, 0xd5, 0x35, 0x0e, 0x63, 0xa3, 0x63, 0x98, 0x2f, 0x0c, 0x3d, 0xc3,
-	0x3f, 0x4e, 0x06, 0xf8, 0x9b, 0x36, 0xee, 0xea, 0xd9, 0xe3, 0x4d, 0xd8, 0x10, 0xfb, 0x36, 0xff,
-	0xa8, 0x41, 0x41, 0x78, 0xd0, 0x9b, 0xfa, 0xe8, 0xff, 0x21, 0x0e, 0x2e, 0x51, 0xff, 0x78, 0x4f,
-	0x16, 0x51, 0x57, 0xc1, 0x71, 0xc0, 0x8c, 0x15, 0xce, 0x99, 0xe3, 0xd0, 0x88, 0x99, 0x33, 0x92,
-	0x39, 0x22, 0xc4, 0xcc, 0x8f, 0x13, 0x92, 0x53, 0x55, 0x29, 0x87, 0xb7, 0x22, 0x42, 0x54, 0x84,
-	0x93, 0xe3, 0x6f, 0xaa, 0x58, 0x27, 0xc6, 0x5f, 0xc5, 0xdb, 0xfc, 0x29, 0x94, 0x93, 0x3e, 0x47,
-	0x8f, 0x20, 0xe7, 0x78, 0x53, 0x5f, 0x25, 0xe2, 0xce, 0x8d, 0xe0, 0xe2, 0x46, 0x62, 0xc1, 0xd0,
-	0x44, 0xa0, 0xdf, 0xf4, 0x73, 0xb3, 0x02, 0xa5, 0x84, 0xd3, 0x9a, 0x7f, 0xd3, 0xa0, 0x92, 0x72,
-	0xc2, 0xbf, 0x2d, 0x1d, 0x7d, 0x01, 0xe5, 0x57, 0x4e, 0x40, 0x49, 0x72, 0x42, 0xa8, 0x1e, 0xd5,
-	0xd3, 0x13, 0x42, 0xf4, 0x7f, 0xc7, 0xb7, 0x29, 0x2e, 0x71, 0x7e, 0x05, 0xa0, 0x5f, 0x40, 0x55,
-	0xad, 0x24, 0x36, 0x65, 0x96, 0xe3, 0x8a, 0xa3, 0xaa, 0xa6, 0xc2, 0x43, 0xf1, 0x76, 0x05, 0x1d,
-	0x57, 0xa6, 0xc9, 0x4f, 0xf4, 0xe1, 0x4a, 0x40, 0xc8, 0x02, 0xc7, 0xbb, 0x14, 0xe7, 0x57, 0x8c,
-	0xd9, 0x46, 0x02, 0xe4, 0xbd, 0xbe, 0xa2, 0xe6, 0xcb, 0x11, 0xb3, 0xd8, 0x32, 0x44, 0x1f, 0xc3,
-	0x46, 0xc8, 0x2c, 0x55, 0xc9, 0xaa, 0xa9, 0xdc, 0x4a, 0x30, 0x52, 0x2c, 0xb9, 0x52, 0x03, 0x52,
-	0xe6, 0xd6, 0x80, 0xb4, 0xc1, 0x2b, 0x86, 0x2c, 0xb4, 0xa5, 0x23, 0xa4, 0x8c, 0x3f, 0x1d, 0xf7,
-	0x3a, 0x6d, 0xc6, 0xe8, 0x7c, 0xc1, 0xb0, 0x64, 0x50, 0x0d, 0xf0, 0x4b, 0x80, 0x8e, 0x13, 0x4c,
-	0x96, 0x0e, 0x7b, 0x4e, 0xaf, 0x79, 0x5b, 0x8b, 0x2a, 0xba, 0x2c, 0x7b, 0xf9, 0x89, 0xac, 0xe2,
-	0x7b, 0xb0, 0x19, 0x15, 0x22, 0x59, 0xdf, 0xf2, 0x33, 0x51, 0x80, 0x9a, 0x7f, 0xca, 0xc1, 0xbe,
-	0x72, 0xa9, 0xf4, 0x06, 0xa3, 0xc1, 0x84, 0x2e, 0xe2, 0xc9, 0xf9, 0x29, 0xec, 0xae, 0x8a, 0xaa,
-	0xdc, 0x88, 0x44, 0xd3, 0x78, 0xe9, 0xe8, 0xed, 0x84, 0xa5, 0x2b, 0x35, 0x30, 0x8a, 0x8b, 0xed,
-	0x4a, 0xb5, 0xc3, 0x84, 0x20, 0x6b, 0xee, 0x2f, 0x3d, 0x15, 0xa2, 0xb2, 0xe2, 0xa1, 0x55, 0x38,
-	0x73, 0x92, 0x88, 0xe8, 0x47, 0x10, 0x07, 0x39, 0xa1, 0x3f, 0x2c, 0x9c, 0xe0, 0x5a, 0x54, 0xbf,
-	0xca, 0xaa, 0xdc, 0x1a, 0x02, 0xbd, 0x35, 0xce, 0x66, 0x6e, 0x8f, 0xb3, 0x9f, 0x41, 0x3d, 0xce,
-	0x0e, 0x75, 0xd3, 0xa5, 0x76, 0xdc, 0xfd, 0x36, 0x85, 0x0e, 0x7b, 0x11, 0x07, 0x8e, 0x18, 0x54,
-	0x0b, 0x3c, 0x84, 0xdd, 0x44, 0x6a, 0xad, 0x54, 0x97, 0x99, 0x88, 0x56, 0xd9, 0x95, 0x54, 0x3d,
-	0x5e, 0xa1, 0x54, 0xcf, 0x49, 0xd5, 0x23, 0x58, 0xa9, 0xfe, 0x2b, 0xa8, 0xde, 0xb8, 0x09, 0x16,
-	0x84, 0xdf, 0x7f, 0x76, 0xbb, 0xb2, 0xae, 0x73, 0xcf, 0xc1, 0x9a, 0xeb, 0x60, 0x65, 0x92, 0xba,
-	0x0a, 0x3e, 0x00, 0xf0, 0x3d, 0xc7, 0xf7, 0xc8, 0x85, 0xeb, 0x5f, 0x88, 0x82, 0x5b, 0xc6, 0x45,
-	0x81, 0x1c, 0xbb, 0xfe, 0x45, 0xfd, 0x2b, 0x40, 0xff, 0xe5, 0x95, 0xeb, 0xcf, 0x1a, 0xdc, 0x5f,
-	0xaf, 0xa2, 0xea, 0xf3, 0xff, 0xb3, 0x10, 0xfa, 0x0c, 0xf2, 0xd6, 0x84, 0x39, 0xbe, 0xa7, 0x2a,
-	0xc3, 0xfb, 0x89, 0xa5, 0x98, 0x86, 0xbe, 0xfb, 0x92, 0x9e, 0xfa, 0xae, 0xad, 0x94, 0x69, 0x0b,
-	0x56, 0xac, 0x96, 0xa4, 0x92, 0x2e, 0x9b, 0x4e, 0xba, 0xc7, 0xbf, 0xcd, 0x41, 0x25, 0x55, 0x19,
-	0xd2, 0xad, 0xa1, 0x02, 0xc5, 0xfe, 0x80, 0x74, 0x8d, 0x71, 0xdb, 0xec, 0xe9, 0x1a, 0xd2, 0xa1,
-	0x3c, 0xe8, 0x9b, 0x83, 0x3e, 0xe9, 0x1a, 0x9d, 0x41, 0x97, 0x37, 0x89, 0xb7, 0x61, 0xbb, 0x67,
-	0xf6, 0x9f, 0x93, 0xfe, 0x60, 0x4c, 0x8c, 0x9e, 0xf9, 0xd4, 0x3c, 0xee, 0x19, 0x7a, 0x16, 0xed,
-	0x82, 0x3e, 0xe8, 0x93, 0xce, 0x69, 0xdb, 0xec, 0x93, 0xb1, 0x79, 0x66, 0x0c, 0xce, 0xc7, 0x7a,
-	0x8e, 0xa3, 0x3c, 0x9b, 0x89, 0xf1, 0x6d, 0xc7, 0x30, 0xba, 0x23, 0x72, 0xd6, 0xfe, 0x56, 0xdf,
-	0x40, 0x35, 0xd8, 0x35, 0xfb, 0xa3, 0xf3, 0x93, 0x13, 0xb3, 0x63, 0x1a, 0xfd, 0x31, 0x39, 0x6e,
-	0xf7, 0xda, 0xfd, 0x8e, 0xa1, 0xe7, 0xd1, 0x3d, 0x40, 0x66, 0xbf, 0x33, 0x38, 0x1b, 0xf6, 0x8c,
-	0xb1, 0x41, 0xa2, 0x66, 0xb4, 0x89, 0x76, 0x60, 0x4b, 0xc8, 0x69, 0x77, 0xbb, 0xe4, 0xa4, 0x6d,
-	0xf6, 0x8c, 0xae, 0x5e, 0xe0, 0x9a, 0x28, 0x8e, 0x11, 0xe9, 0x9a, 0xa3, 0xf6, 0x31, 0x87, 0x8b,
-	0x7c, 0x4f, 0xb3, 0xff, 0x62, 0x60, 0x76, 0x0c, 0xd2, 0xe1, 0x62, 0x39, 0x0a, 0x9c, 0x39, 0x42,
-	0xcf, 0xfb, 0x5d, 0x03, 0x0f, 0xdb, 0x66, 0x57, 0x2f, 0xa1, 0x7d, 0xd8, 0x8b, 0x60, 0xe3, 0xdb,
-	0xa1, 0x89, 0xbf, 0x23, 0xe3, 0xc1, 0x80, 0x8c, 0x06, 0x83, 0xbe, 0x5e, 0x4e, 0x4a, 0xe2, 0xd6,
-	0x0e, 0x86, 0x46, 0x5f, 0xaf, 0xa0, 0x3d, 0xd8, 0x39, 0x1b, 0x0e, 0x49, 0x44, 0x89, 0x8c, 0xad,
-	0x72, 0xf6, 0x76, 0xb7, 0x8b, 0x8d, 0xd1, 0x88, 0x9c, 0x99, 0xa3, 0xb3, 0xf6, 0xb8, 0x73, 0xaa,
-	0x6f, 0x71, 0x93, 0x46, 0xc6, 0x98, 0x8c, 0x07, 0xe3, 0x76, 0x6f, 0x85, 0xeb, 0x5c, 0xa1, 0x15,
-	0xce, 0x37, 0xed, 0x0d, 0xbe, 0xd1, 0xb7, 0xf9, 0x81, 0x73, 0x78, 0xf0, 0x42, 0xa9, 0x88, 0xb8,
-	0xed, 0xca, 0x3d, 0xd1, 0x9e, 0xfa, 0x0e, 0x07, 0xcd, 0xfe, 0x8b, 0x76, 0xcf, 0xec, 0x92, 0xe7,
-	0xc6, 0x77, 0xa2, 0x99, 0xef, 0x72, 0x50, 0x6a, 0x46, 0x86, 0x78, 0xf0, 0x94, 0x2b, 0xa2, 0xbf,
-	0x8d, 0x10, 0x54, 0x3b, 0x26, 0xee, 0x9c, 0xf7, 0xda, 0x98, 0xe0, 0xc1, 0xf9, 0xd8, 0xd0, 0xef,
-	0x3d, 0xfe, 0x83, 0x06, 0xe5, 0x64, 0xb1, 0xe6, 0x5e, 0x37, 0xfb, 0xe4, 0xa4, 0x67, 0x3e, 0x3d,
-	0x1d, 0xcb, 0x20, 0x18, 0x9d, 0x77, 0xb8, 0xcb, 0x0c, 0x3e, 0x24, 0x20, 0xa8, 0xca, 0x43, 0x8f,
-	0x8d, 0xcd, 0xf0, 0xbd, 0x14, 0xd6, 0x1f, 0x28, 0xb9, 0x59, 0xae, 0xbc, 0x02, 0x0d, 0x8c, 0x07,
-	0x58, 0xcf, 0xa1, 0x0f, 0xa0, 0xa1, 0x10, 0xee, 0x57, 0x8c, 0x8d, 0xce, 0x98, 0x0c, 0xdb, 0xdf,
-	0x9d, 0x71, 0xb7, 0xcb, 0x20, 0x1b, 0xe9, 0x1b, 0xe8, 0x5d, 0xd8, 0x8f, 0xb9, 0xd6, 0xc5, 0xc5,
-	0xe3, 0xcf, 0xa1, 0x76, 0x57, 0xd0, 0x23, 0x80, 0xfc, 0xc8, 0x18, 0x8f, 0x7b, 0x86, 0x1c, 0x6c,
-	0x4e, 0x64, 0xe0, 0x02, 0xe4, 0xb1, 0x31, 0x3a, 0x3f, 0x33, 0xf4, 0xcc, 0xd1, 0x5f, 0x0a, 0x90,
-	0x17, 0x93, 0x76, 0x80, 0xbe, 0x82, 0x4a, 0xe2, 0xb1, 0xe9, 0xc5, 0x11, 0x7a, 0xf0, 0xda, 0x67,
-	0xa8, 0x7a, 0x74, 0x65, 0x57, 0xf0, 0xa1, 0x86, 0x8e, 0xa1, 0x9a, 0x7c, 0x75, 0x79, 0x71, 0x84,
-	0x92, 0x03, 0xea, 0x9a, 0x07, 0x99, 0x35, 0x32, 0x9e, 0x83, 0x6e, 0x84, 0xcc, 0x99, 0xf3, 0x3e,
-	0xa9, 0xde, 0x45, 0x50, 0x3d, 0x99, 0xe0, 0xe9, 0xc7, 0x96, 0xfa, 0xfe, 0x5a, 0x9a, 0x2a, 0x39,
-	0x5f, 0xf3, 0x99, 0x24, 0x7e, 0x99, 0xb8, 0x65, 0x50, 0xfa, 0x39, 0xa4, 0xfe, 0xce, 0x5d, 0x64,
-	0xf5, 0x9a, 0x90, 0xfd, 0x5d, 0x86, 0xdb, 0x58, 0x49, 0xd0, 0xd6, 0x9c, 0xd2, 0x0d, 0xa1, 0x6b,
-	0x3a, 0x37, 0xb2, 0x61, 0x67, 0xcd, 0xab, 0x05, 0xfa, 0x30, 0x5d, 0xc7, 0xee, 0x78, 0xf3, 0xa8,
-	0x3f, 0x7c, 0x13, 0x9b, 0x32, 0xde, 0x86, 0x9d, 0x35, 0xcf, 0x1b, 0xa9, 0x5d, 0xee, 0x7e, 0x1c,
-	0x49, 0xed, 0xf2, 0xba, 0x57, 0x92, 0xef, 0x41, 0xbf, 0x79, 0x1b, 0x46, 0xcd, 0x9b, 0x6b, 0x6f,
-	0x5f, 0xcb, 0xeb, 0xef, 0xbf, 0x96, 0x47, 0x09, 0x37, 0x01, 0x56, 0x17, 0x46, 0x74, 0x3f, 0xb1,
-	0xe4, 0xd6, 0x9d, 0xb8, 0xfe, 0xe0, 0x0e, 0xaa, 0x12, 0x35, 0x86, 0x9d, 0x35, 0x37, 0xc8, 0xd4,
-	0x69, 0xdc, 0x7d, 0xc3, 0xac, 0xef, 0xae, 0xbb, 0x68, 0x1d, 0x6a, 0xe8, 0x4c, 0x06, 0x58, 0xf4,
-	0x82, 0xfa, 0x86, 0x8c, 0xa9, 0xad, 0x1f, 0x08, 0x97, 0xa1, 0x08, 0xad, 0x43, 0x0d, 0x0d, 0xa0,
-	0x9c, 0xcc, 0x92, 0x37, 0xa6, 0xcf, 0x1b, 0x05, 0x4e, 0x61, 0x2b, 0xd5, 0x8c, 0xfd, 0x00, 0x3d,
-	0x7a, 0xe3, 0x48, 0x21, 0x4f, 0x2c, 0x15, 0x01, 0xaf, 0x99, 0x3d, 0x5a, 0xda, 0xa1, 0x76, 0xfc,
-	0xc9, 0x2f, 0x9f, 0x5c, 0x3a, 0x6c, 0xb6, 0xbc, 0x38, 0x98, 0xf8, 0xf3, 0x27, 0xe2, 0x81, 0xd4,
-	0x73, 0xbc, 0x4b, 0x8f, 0xb2, 0x57, 0x7e, 0x70, 0xf5, 0xc4, 0xf5, 0xec, 0x27, 0x22, 0x0d, 0x9e,
-	0xc4, 0x22, 0x2f, 0xf2, 0xe2, 0xef, 0x23, 0x3f, 0xfa, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02,
-	0x24, 0x31, 0xa7, 0x4f, 0x19, 0x00, 0x00,
+	// 2622 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x59, 0xcd, 0x76, 0xdb, 0xc6,
+	0xf5, 0x0f, 0xf8, 0x25, 0xf2, 0xf2, 0x43, 0xd0, 0x48, 0xb1, 0xf8, 0xa7, 0xec, 0x84, 0x61, 0x12,
+	0x9b, 0xc7, 0xff, 0x44, 0x56, 0xd4, 0x9e, 0x36, 0x6d, 0x3e, 0x1a, 0x8a, 0x84, 0x2c, 0xd8, 0x14,
+	0xa9, 0x0c, 0x29, 0x27, 0x69, 0x16, 0x53, 0x88, 0x18, 0x8a, 0xa8, 0x40, 0x80, 0x05, 0x86, 0x76,
+	0xb4, 0xec, 0xae, 0xa7, 0x0f, 0xd0, 0xc7, 0xe8, 0x13, 0xf4, 0x9c, 0x76, 0xd1, 0x55, 0x5f, 0xa2,
+	0xdb, 0x3e, 0x41, 0xd7, 0x3d, 0xf3, 0x01, 0x10, 0x90, 0x28, 0xbb, 0x3d, 0xed, 0xc6, 0x26, 0x7e,
+	0xf7, 0xce, 0x9d, 0x7b, 0xe7, 0x7e, 0xce, 0x08, 0xee, 0x05, 0xfe, 0x92, 0xd1, 0x20, 0x58, 0x4c,
+	0x9e, 0xc8, 0x5f, 0xfb, 0x8b, 0xc0, 0x67, 0x3e, 0x2a, 0xc5, 0x78, 0xa3, 0x14, 0x2c, 0x26, 0x12,
+	0x6d, 0xfd, 0x61, 0x03, 0xd0, 0x88, 0x7a, 0xf6, 0x99, 0x75, 0x3d, 0xa7, 0x1e, 0xc3, 0xf4, 0x37,
+	0x4b, 0x1a, 0x32, 0x84, 0x20, 0x67, 0xd3, 0x90, 0xd5, 0xb5, 0xa6, 0xd6, 0xae, 0x60, 0xf1, 0x1b,
+	0xe9, 0x90, 0xb5, 0xe6, 0xac, 0x9e, 0x69, 0x6a, 0xed, 0x2c, 0xe6, 0x3f, 0xd1, 0xff, 0x41, 0xd1,
+	0x9a, 0x33, 0x32, 0x0f, 0x2d, 0x56, 0xaf, 0x08, 0x78, 0xc3, 0x9a, 0xb3, 0xd3, 0xd0, 0x62, 0xe8,
+	0x3d, 0xa8, 0x2c, 0xa4, 0x48, 0x32, 0xb3, 0xc2, 0x59, 0x3d, 0x2b, 0x04, 0x95, 0x15, 0x76, 0x62,
+	0x85, 0x33, 0xd4, 0x06, 0x7d, 0xea, 0x78, 0x96, 0x4b, 0x26, 0x2e, 0x7b, 0x49, 0x6c, 0xea, 0x32,
+	0xab, 0x9e, 0x6b, 0x6a, 0xed, 0x3c, 0xae, 0x09, 0xbc, 0xeb, 0xb2, 0x97, 0x3d, 0x8e, 0x26, 0x85,
+	0x59, 0xb6, 0x1d, 0xd4, 0x77, 0x52, 0xc2, 0x3a, 0xb6, 0x1d, 0xa0, 0x47, 0xb0, 0x19, 0xb1, 0x04,
+	0xd2, 0x86, 0x7a, 0xbe, 0xa9, 0xb5, 0x4b, 0xb8, 0xb6, 0x48, 0x5b, 0xf6, 0x08, 0x36, 0x99, 0x33,
+	0xa7, 0xfe, 0x92, 0x91, 0x90, 0x4e, 0x7c, 0xcf, 0x0e, 0xeb, 0x05, 0xb9, 0xa9, 0x82, 0x47, 0x12,
+	0x45, 0x2d, 0xa8, 0x4e, 0x29, 0x25, 0xae, 0x33, 0x77, 0x18, 0xe1, 0x16, 0x6e, 0x08, 0x0b, 0xcb,
+	0x53, 0x4a, 0xfb, 0x1c, 0x1b, 0x59, 0x0c, 0x7d, 0x00, 0xb5, 0x15, 0x8f, 0x38, 0x86, 0xaa, 0x60,
+	0xaa, 0x44, 0x4c, 0xe2, 0x2c, 0xf6, 0x41, 0xf7, 0x97, 0xec, 0xd2, 0x77, 0xbc, 0x4b, 0x32, 0x99,
+	0x59, 0x1e, 0x71, 0xec, 0x7a, 0xb1, 0xa9, 0xb5, 0x73, 0x47, 0xb9, 0xba, 0x76, 0xa0, 0xe1, 0x5a,
+	0x44, 0xed, 0xce, 0x2c, 0xcf, 0xb4, 0xd1, 0x63, 0xd8, 0xba, 0xc9, 0x1f, 0xd6, 0xb7, 0x9b, 0xd9,
+	0x76, 0x0e, 0x6f, 0xa6, 0x59, 0x43, 0xf4, 0x10, 0x36, 0x5d, 0x2b, 0x64, 0x64, 0xe6, 0x2f, 0xc8,
+	0x62, 0x79, 0x71, 0x45, 0xaf, 0xeb, 0x35, 0x71, 0x3a, 0x55, 0x0e, 0x9f, 0xf8, 0x8b, 0x33, 0x01,
+	0xa2, 0x07, 0x00, 0xe2, 0x98, 0x85, 0xaa, 0xf5, 0x92, 0xb0, 0xb8, 0xc4, 0x11, 0xa1, 0x26, 0xfa,
+	0x04, 0xca, 0x22, 0x3c, 0xc8, 0xcc, 0xf1, 0x58, 0x58, 0x87, 0x66, 0xb6, 0x5d, 0x3e, 0xd4, 0xf7,
+	0x5d, 0x8f, 0x47, 0x0a, 0xe6, 0x94, 0x13, 0xc7, 0x63, 0x18, 0x82, 0xe8, 0x67, 0x88, 0x6c, 0xd8,
+	0xe6, 0x61, 0x41, 0x26, 0xcb, 0x90, 0xf9, 0x73, 0x12, 0xd0, 0x89, 0x1f, 0xd8, 0x61, 0xbd, 0x2c,
+	0x96, 0xfe, 0x78, 0x3f, 0x8e, 0xb6, 0xfd, 0xdb, 0xe1, 0xb5, 0xdf, 0xa3, 0x21, 0xeb, 0x8a, 0x75,
+	0x58, 0x2e, 0x33, 0x3c, 0x16, 0x5c, 0xe3, 0x2d, 0xfb, 0x26, 0x8e, 0x3e, 0x02, 0x64, 0xb9, 0xae,
+	0xff, 0x8a, 0x84, 0xd4, 0x9d, 0x12, 0xe5, 0xcb, 0xfa, 0x66, 0x53, 0x6b, 0x17, 0xb1, 0x2e, 0x28,
+	0x23, 0xea, 0x4e, 0x95, 0x78, 0xf4, 0x13, 0xa8, 0x0a, 0x9d, 0xa6, 0xd4, 0x62, 0xcb, 0x80, 0x86,
+	0x75, 0xbd, 0x99, 0x6d, 0xd7, 0x0e, 0xb7, 0x94, 0x21, 0xc7, 0x12, 0x3e, 0x72, 0x18, 0xae, 0x70,
+	0x3e, 0xf5, 0x1d, 0xa2, 0x3d, 0x28, 0xcd, 0xad, 0x1f, 0xc8, 0xc2, 0x0a, 0x58, 0x58, 0xdf, 0x6a,
+	0x6a, 0xed, 0x2a, 0x2e, 0xce, 0xad, 0x1f, 0xce, 0xf8, 0x37, 0xda, 0x87, 0x6d, 0xcf, 0x27, 0x8e,
+	0x37, 0x75, 0x9d, 0xcb, 0x19, 0x23, 0xcb, 0x85, 0x6d, 0x31, 0x1a, 0xd6, 0x91, 0xd0, 0x61, 0xcb,
+	0xf3, 0x4d, 0x45, 0x39, 0x97, 0x84, 0x46, 0x0f, 0xee, 0xad, 0xb7, 0x8f, 0x67, 0x10, 0x77, 0x10,
+	0x4f, 0xaa, 0x1c, 0xe6, 0x3f, 0xd1, 0x0e, 0xe4, 0x5f, 0x5a, 0xee, 0x92, 0x8a, 0xac, 0xaa, 0x60,
+	0xf9, 0xf1, 0xf3, 0xcc, 0xa7, 0x5a, 0x6b, 0x06, 0xdb, 0xe3, 0xc0, 0x9a, 0x5c, 0xdd, 0x48, 0xcc,
+	0x9b, 0x79, 0xa5, 0xdd, 0xce, 0xab, 0x3b, 0xf4, 0xcd, 0xdc, 0xa1, 0x6f, 0xeb, 0x4b, 0xd8, 0x14,
+	0x1e, 0x3e, 0xa6, 0xf4, 0x75, 0xe9, 0xbf, 0x0b, 0x3c, 0xb9, 0x45, 0x26, 0xc8, 0x12, 0x50, 0xb0,
+	0xe6, 0x3c, 0x09, 0x5a, 0x36, 0xe8, 0xab, 0xf5, 0xe1, 0xc2, 0xf7, 0x42, 0xca, 0x73, 0x9b, 0x07,
+	0x00, 0x8f, 0x60, 0x9e, 0x20, 0x22, 0x35, 0x34, 0xb1, 0xaa, 0xa6, 0xf0, 0x63, 0x4a, 0x45, 0x72,
+	0x3c, 0x94, 0xf9, 0x48, 0x5c, 0x7f, 0x72, 0xc5, 0x8b, 0x80, 0x75, 0xad, 0xc4, 0x57, 0x39, 0xdc,
+	0xf7, 0x27, 0x57, 0x3d, 0x0e, 0xb6, 0xbe, 0x97, 0x75, 0x6a, 0xec, 0x8b, 0xbd, 0xfe, 0x83, 0xe3,
+	0x68, 0x41, 0x5e, 0xc4, 0xa2, 0x10, 0x5b, 0x3e, 0xac, 0x24, 0x83, 0x1a, 0x4b, 0x52, 0xeb, 0x7b,
+	0xd8, 0x4e, 0x09, 0x57, 0x56, 0x34, 0xa0, 0xb8, 0x08, 0xa8, 0x33, 0xb7, 0x2e, 0xa9, 0x92, 0x1c,
+	0x7f, 0xa3, 0x36, 0x6c, 0x4c, 0x2d, 0xc7, 0x5d, 0x06, 0x91, 0xe0, 0x5a, 0x14, 0x64, 0x12, 0xc5,
+	0x11, 0xb9, 0x75, 0x1f, 0x1a, 0x98, 0x86, 0x94, 0x9d, 0x3a, 0x61, 0xe8, 0xf8, 0x5e, 0xd7, 0xf7,
+	0x58, 0xe0, 0xbb, 0xca, 0x82, 0xd6, 0x03, 0xd8, 0x5b, 0x4b, 0x95, 0x2a, 0xf0, 0xc5, 0x5f, 0x2f,
+	0x69, 0x70, 0xbd, 0x7e, 0xf1, 0xd7, 0xb0, 0xb7, 0x96, 0xaa, 0xf4, 0xff, 0x08, 0xf2, 0x0b, 0xcb,
+	0x09, 0xb8, 0xef, 0x79, 0x52, 0xde, 0x4b, 0x24, 0xe5, 0x99, 0xe5, 0x04, 0x27, 0x4e, 0xc8, 0xfc,
+	0xe0, 0x1a, 0x4b, 0xa6, 0x67, 0xb9, 0xa2, 0xa6, 0x67, 0x5a, 0xbf, 0xd7, 0xa0, 0x9c, 0x20, 0xf2,
+	0xd4, 0xf0, 0x7c, 0x9b, 0x92, 0x69, 0xe0, 0xcf, 0xa3, 0x43, 0xe0, 0xc0, 0x71, 0xe0, 0xcf, 0x79,
+	0x4c, 0x08, 0x22, 0xf3, 0x55, 0x00, 0x17, 0xf8, 0xe7, 0xd8, 0x47, 0x1f, 0xc3, 0xc6, 0x4c, 0x0a,
+	0x10, 0x65, 0xb3, 0x7c, 0xb8, 0x7d, 0x63, 0xef, 0x9e, 0xc5, 0x2c, 0x1c, 0xf1, 0x3c, 0xcb, 0x15,
+	0xb3, 0x7a, 0xee, 0x59, 0xae, 0x98, 0xd3, 0xf3, 0xcf, 0x72, 0xc5, 0xbc, 0x5e, 0x78, 0x96, 0x2b,
+	0x16, 0xf4, 0x8d, 0xd6, 0x3f, 0x34, 0x28, 0x46, 0xdc, 0x5c, 0x13, 0x7e, 0xa4, 0x84, 0xc7, 0x85,
+	0x0a, 0xa6, 0x22, 0x07, 0xc6, 0xce, 0x9c, 0xa2, 0x26, 0x54, 0x04, 0x31, 0x1d, 0xa2, 0xc0, 0xb1,
+	0x8e, 0x08, 0x53, 0x51, 0xcf, 0x23, 0x0e, 0x11, 0x8f, 0x39, 0x55, 0xcf, 0x25, 0x4b, 0xd4, 0xb5,
+	0xc2, 0xe5, 0x64, 0x42, 0xc3, 0x50, 0xee, 0x92, 0x97, 0x2c, 0x0a, 0x13, 0x1b, 0x3d, 0x84, 0xcd,
+	0x88, 0x25, 0xda, 0xab, 0x20, 0xe3, 0x55, 0xc1, 0x6a, 0xbb, 0x36, 0xe8, 0x49, 0xbe, 0xf9, 0xaa,
+	0x83, 0xd4, 0x56, 0x8c, 0x7c, 0x53, 0x69, 0x7c, 0xeb, 0xd7, 0xb0, 0x2b, 0x5c, 0x79, 0x16, 0xf8,
+	0x17, 0xd6, 0x85, 0xe3, 0x3a, 0xec, 0x3a, 0x0a, 0x72, 0x6e, 0x78, 0xe0, 0xcf, 0x09, 0x3f, 0xdb,
+	0xc8, 0x05, 0x1c, 0x18, 0xf8, 0x36, 0xe5, 0x2e, 0x60, 0xbe, 0x24, 0x29, 0x17, 0x30, 0x5f, 0x10,
+	0x92, 0xcd, 0x39, 0x9b, 0x6a, 0xce, 0xad, 0x2b, 0xa8, 0xdf, 0xde, 0x4b, 0xc5, 0x4c, 0x13, 0xca,
+	0x8b, 0x15, 0x2c, 0xb6, 0xd3, 0x70, 0x12, 0x4a, 0xfa, 0x36, 0xf3, 0x66, 0xdf, 0xb6, 0xfe, 0xa6,
+	0xc1, 0xd6, 0xd1, 0xd2, 0x71, 0xed, 0x54, 0xe2, 0x26, 0xb5, 0xd3, 0xd2, 0xa3, 0xc3, 0xba, 0xb9,
+	0x20, 0xb3, 0x76, 0x2e, 0xf8, 0x68, 0x4d, 0x63, 0xcd, 0x8a, 0xc6, 0x9a, 0x59, 0xd3, 0x56, 0xdf,
+	0x85, 0xf2, 0xaa, 0x4b, 0x86, 0xf5, 0x5c, 0x33, 0xdb, 0xae, 0x60, 0x98, 0x45, 0x2d, 0x32, 0xbc,
+	0x35, 0x66, 0xe4, 0x6f, 0x8d, 0x19, 0xad, 0x4f, 0x01, 0x25, 0x6d, 0x51, 0x67, 0x16, 0x97, 0x18,
+	0xed, 0xee, 0x12, 0x73, 0x1f, 0x1a, 0xa3, 0xe5, 0x45, 0x38, 0x09, 0x9c, 0x0b, 0x7a, 0xc2, 0xdc,
+	0x89, 0xf1, 0x92, 0x7a, 0x2c, 0x8c, 0x12, 0xf9, 0x9f, 0x39, 0x28, 0xc5, 0x28, 0xaf, 0xe0, 0x8e,
+	0x37, 0xf1, 0xe7, 0x91, 0x5d, 0x1e, 0x75, 0xb9, 0x69, 0xb2, 0x6f, 0x6c, 0x45, 0xa4, 0xae, 0xa4,
+	0x98, 0x36, 0xe7, 0x4f, 0x9d, 0x83, 0xe2, 0xcf, 0x48, 0xfe, 0xe4, 0x31, 0x48, 0xfe, 0x36, 0xe8,
+	0xb1, 0xfc, 0x19, 0x73, 0x27, 0xf1, 0xb9, 0xe1, 0x5a, 0x84, 0x73, 0x65, 0x24, 0x67, 0x2c, 0x39,
+	0xe2, 0xcc, 0x49, 0xce, 0x08, 0x57, 0x9c, 0xef, 0x41, 0x85, 0xa7, 0x4c, 0xc8, 0xac, 0xf9, 0x82,
+	0x78, 0xa1, 0x38, 0xbc, 0x1c, 0x2e, 0xc7, 0xd8, 0x20, 0x44, 0x5f, 0x00, 0x50, 0x6e, 0x1f, 0x61,
+	0xd7, 0x0b, 0x2a, 0xb2, 0xa6, 0x76, 0xf8, 0x4e, 0x22, 0x76, 0xe2, 0x03, 0xd8, 0x17, 0xff, 0x8e,
+	0xaf, 0x17, 0x14, 0x97, 0x68, 0xf4, 0x13, 0x7d, 0x09, 0xd5, 0xa9, 0x1f, 0xbc, 0xb2, 0x02, 0x9b,
+	0x08, 0x50, 0x55, 0x96, 0xdd, 0x84, 0x84, 0x63, 0x49, 0x17, 0xcb, 0x4f, 0xde, 0xc2, 0x95, 0x69,
+	0xe2, 0x1b, 0x3d, 0x07, 0x14, 0xad, 0x17, 0x85, 0x40, 0x0a, 0x29, 0x0a, 0x21, 0x7b, 0xb7, 0x85,
+	0xf0, 0x3a, 0x1e, 0x09, 0xd2, 0xa7, 0x37, 0x30, 0xf4, 0x19, 0x54, 0x42, 0xca, 0x98, 0x4b, 0x95,
+	0x98, 0x92, 0x10, 0x73, 0x2f, 0x35, 0xf6, 0x70, 0x72, 0x24, 0xa1, 0x1c, 0xae, 0x3e, 0xd1, 0x11,
+	0x6c, 0xba, 0x8e, 0x77, 0x95, 0x54, 0x03, 0xc4, 0xfa, 0x7a, 0x62, 0x7d, 0xdf, 0xf1, 0xae, 0x92,
+	0x3a, 0x54, 0xdd, 0x24, 0xd0, 0xfa, 0x1c, 0x4a, 0xf1, 0x29, 0xa1, 0x32, 0x6c, 0x9c, 0x0f, 0x9e,
+	0x0f, 0x86, 0xdf, 0x0c, 0xf4, 0xb7, 0x50, 0x11, 0x72, 0x23, 0x63, 0xd0, 0xd3, 0x35, 0x0e, 0x63,
+	0xa3, 0x6b, 0x98, 0x2f, 0x0c, 0x3d, 0xc3, 0x3f, 0x8e, 0x87, 0xf8, 0x9b, 0x0e, 0xee, 0xe9, 0xd9,
+	0xa3, 0x0d, 0xc8, 0x8b, 0x7d, 0x5b, 0x7f, 0xd2, 0xa0, 0x28, 0x3c, 0xe8, 0x4d, 0x7d, 0xf4, 0xff,
+	0x10, 0x07, 0x97, 0xa8, 0x7f, 0xbc, 0x27, 0x8b, 0xa8, 0xab, 0xe2, 0x38, 0x60, 0xc6, 0x0a, 0xe7,
+	0xcc, 0x71, 0x68, 0xc4, 0xcc, 0x19, 0xc9, 0x1c, 0x11, 0x62, 0xe6, 0xc7, 0x09, 0xc9, 0xa9, 0xaa,
+	0x94, 0xc3, 0x9b, 0x11, 0x21, 0x2a, 0xc2, 0xc9, 0xf1, 0x37, 0x55, 0xac, 0x13, 0xe3, 0xaf, 0xe2,
+	0x6d, 0xfd, 0x14, 0x2a, 0x49, 0x9f, 0xa3, 0x47, 0x90, 0x73, 0xbc, 0xa9, 0xaf, 0x12, 0x71, 0xfb,
+	0x46, 0x70, 0x71, 0x23, 0xb1, 0x60, 0x68, 0x21, 0xd0, 0x6f, 0xfa, 0xb9, 0x55, 0x85, 0x72, 0xc2,
+	0x69, 0xad, 0xbf, 0x6b, 0x50, 0x4d, 0x39, 0xe1, 0xdf, 0x96, 0x8e, 0xbe, 0x80, 0xca, 0x2b, 0x27,
+	0xa0, 0x24, 0x39, 0x21, 0xd4, 0x0e, 0x1b, 0xe9, 0x09, 0x21, 0xfa, 0xbf, 0xeb, 0xdb, 0x14, 0x97,
+	0x39, 0xbf, 0x02, 0xd0, 0x2f, 0xa0, 0xa6, 0x56, 0x12, 0x9b, 0x32, 0xcb, 0x71, 0xc5, 0x51, 0xd5,
+	0x52, 0xe1, 0xa1, 0x78, 0x7b, 0x82, 0x8e, 0xab, 0xd3, 0xe4, 0x27, 0xfa, 0x70, 0x25, 0x20, 0x64,
+	0x81, 0xe3, 0x5d, 0x8a, 0xf3, 0x2b, 0xc5, 0x6c, 0x23, 0x01, 0xf2, 0x5e, 0x5f, 0x55, 0xf3, 0xe5,
+	0x88, 0x59, 0x6c, 0x19, 0xa2, 0x8f, 0x21, 0x1f, 0x32, 0x4b, 0x55, 0xb2, 0x5a, 0x2a, 0xb7, 0x12,
+	0x8c, 0x14, 0x4b, 0xae, 0xd4, 0x80, 0x94, 0xb9, 0x35, 0x20, 0xe5, 0x79, 0xc5, 0x90, 0x85, 0xb6,
+	0x7c, 0x88, 0x94, 0xf1, 0x27, 0xe3, 0x7e, 0xb7, 0xc3, 0x18, 0x9d, 0x2f, 0x18, 0x96, 0x0c, 0xaa,
+	0x01, 0x7e, 0x09, 0xd0, 0x75, 0x82, 0xc9, 0xd2, 0x61, 0xcf, 0xe9, 0x35, 0x6f, 0x6b, 0x51, 0x45,
+	0x97, 0x65, 0xaf, 0x30, 0x91, 0x55, 0x7c, 0x17, 0x36, 0xa2, 0x42, 0x24, 0xeb, 0x5b, 0x61, 0x26,
+	0x0a, 0x50, 0xeb, 0xcf, 0x39, 0xd8, 0x53, 0x2e, 0x95, 0xde, 0x60, 0x34, 0x98, 0xd0, 0x45, 0x3c,
+	0x39, 0x3f, 0x85, 0x9d, 0x55, 0x51, 0x95, 0x1b, 0x91, 0x68, 0x1a, 0x2f, 0x1f, 0xbe, 0x9d, 0xb0,
+	0x74, 0xa5, 0x06, 0x46, 0x71, 0xb1, 0x5d, 0xa9, 0x76, 0x90, 0x10, 0x64, 0xcd, 0xfd, 0xa5, 0xa7,
+	0x42, 0x54, 0x56, 0x3c, 0xb4, 0x0a, 0x67, 0x4e, 0x12, 0x11, 0xfd, 0x08, 0xe2, 0x20, 0x27, 0xf4,
+	0x87, 0x85, 0x13, 0x5c, 0x8b, 0xea, 0x57, 0x5d, 0x95, 0x5b, 0x43, 0xa0, 0xb7, 0xc6, 0xd9, 0xcc,
+	0xed, 0x71, 0xf6, 0x33, 0x68, 0xc4, 0xd9, 0xa1, 0x6e, 0xba, 0xd4, 0x8e, 0xbb, 0xdf, 0x86, 0xd0,
+	0x61, 0x37, 0xe2, 0xc0, 0x11, 0x83, 0x6a, 0x81, 0x07, 0xb0, 0x93, 0x48, 0xad, 0x95, 0xea, 0x32,
+	0x13, 0xd1, 0x2a, 0xbb, 0x92, 0xaa, 0xc7, 0x2b, 0x94, 0xea, 0x39, 0xa9, 0x7a, 0x04, 0x2b, 0xd5,
+	0x7f, 0x05, 0xb5, 0x1b, 0x37, 0xc1, 0xa2, 0xf0, 0xfb, 0xcf, 0x6e, 0x57, 0xd6, 0x75, 0xee, 0xd9,
+	0x5f, 0x73, 0x1d, 0xac, 0x4e, 0x52, 0x57, 0xc1, 0x07, 0x00, 0xbe, 0xe7, 0xf8, 0x1e, 0xb9, 0x70,
+	0xfd, 0x0b, 0x51, 0x70, 0x2b, 0xb8, 0x24, 0x90, 0x23, 0xd7, 0xbf, 0x68, 0x7c, 0x05, 0xe8, 0xbf,
+	0xbc, 0x72, 0xfd, 0x45, 0x83, 0xfb, 0xeb, 0x55, 0x54, 0x7d, 0xfe, 0x7f, 0x16, 0x42, 0x9f, 0x41,
+	0xc1, 0x9a, 0x30, 0xc7, 0xf7, 0x54, 0x65, 0x78, 0x3f, 0xb1, 0x14, 0xd3, 0xd0, 0x77, 0x5f, 0xd2,
+	0x13, 0xdf, 0xb5, 0x95, 0x32, 0x1d, 0xc1, 0x8a, 0xd5, 0x92, 0x54, 0xd2, 0x65, 0xd3, 0x49, 0xf7,
+	0xf8, 0xb7, 0x39, 0xa8, 0xa6, 0x2a, 0x43, 0xba, 0x35, 0x54, 0xa1, 0x34, 0x18, 0x92, 0x9e, 0x31,
+	0xee, 0x98, 0x7d, 0x5d, 0x43, 0x3a, 0x54, 0x86, 0x03, 0x73, 0x38, 0x20, 0x3d, 0xa3, 0x3b, 0xec,
+	0xf1, 0x26, 0xf1, 0x36, 0x6c, 0xf5, 0xcd, 0xc1, 0x73, 0x32, 0x18, 0x8e, 0x89, 0xd1, 0x37, 0x9f,
+	0x9a, 0x47, 0x7d, 0x43, 0xcf, 0xa2, 0x1d, 0xd0, 0x87, 0x03, 0xd2, 0x3d, 0xe9, 0x98, 0x03, 0x32,
+	0x36, 0x4f, 0x8d, 0xe1, 0xf9, 0x58, 0xcf, 0x71, 0x94, 0x67, 0x33, 0x31, 0xbe, 0xed, 0x1a, 0x46,
+	0x6f, 0x44, 0x4e, 0x3b, 0xdf, 0xea, 0x79, 0x54, 0x87, 0x1d, 0x73, 0x30, 0x3a, 0x3f, 0x3e, 0x36,
+	0xbb, 0xa6, 0x31, 0x18, 0x93, 0xa3, 0x4e, 0xbf, 0x33, 0xe8, 0x1a, 0x7a, 0x01, 0xdd, 0x03, 0x64,
+	0x0e, 0xba, 0xc3, 0xd3, 0xb3, 0xbe, 0x31, 0x36, 0x48, 0xd4, 0x8c, 0x36, 0xd0, 0x36, 0x6c, 0x0a,
+	0x39, 0x9d, 0x5e, 0x8f, 0x1c, 0x77, 0xcc, 0xbe, 0xd1, 0xd3, 0x8b, 0x5c, 0x13, 0xc5, 0x31, 0x22,
+	0x3d, 0x73, 0xd4, 0x39, 0xe2, 0x70, 0x89, 0xef, 0x69, 0x0e, 0x5e, 0x0c, 0xcd, 0xae, 0x41, 0xba,
+	0x5c, 0x2c, 0x47, 0x81, 0x33, 0x47, 0xe8, 0xf9, 0xa0, 0x67, 0xe0, 0xb3, 0x8e, 0xd9, 0xd3, 0xcb,
+	0x68, 0x0f, 0x76, 0x23, 0xd8, 0xf8, 0xf6, 0xcc, 0xc4, 0xdf, 0x91, 0xf1, 0x70, 0x48, 0x46, 0xc3,
+	0xe1, 0x40, 0xaf, 0x24, 0x25, 0x71, 0x6b, 0x87, 0x67, 0xc6, 0x40, 0xaf, 0xa2, 0x5d, 0xd8, 0x3e,
+	0x3d, 0x3b, 0x23, 0x11, 0x25, 0x32, 0xb6, 0xc6, 0xd9, 0x3b, 0xbd, 0x1e, 0x36, 0x46, 0x23, 0x72,
+	0x6a, 0x8e, 0x4e, 0x3b, 0xe3, 0xee, 0x89, 0xbe, 0xc9, 0x4d, 0x1a, 0x19, 0x63, 0x32, 0x1e, 0x8e,
+	0x3b, 0xfd, 0x15, 0xae, 0x73, 0x85, 0x56, 0x38, 0xdf, 0xb4, 0x3f, 0xfc, 0x46, 0xdf, 0xe2, 0x07,
+	0xce, 0xe1, 0xe1, 0x0b, 0xa5, 0x22, 0xe2, 0xb6, 0x2b, 0xf7, 0x44, 0x7b, 0xea, 0xdb, 0x1c, 0x34,
+	0x07, 0x2f, 0x3a, 0x7d, 0xb3, 0x47, 0x9e, 0x1b, 0xdf, 0x89, 0x66, 0xbe, 0xc3, 0x41, 0xa9, 0x19,
+	0x39, 0xc3, 0xc3, 0xa7, 0x5c, 0x11, 0xfd, 0x6d, 0x84, 0xa0, 0xd6, 0x35, 0x71, 0xf7, 0xbc, 0xdf,
+	0xc1, 0x04, 0x0f, 0xcf, 0xc7, 0x86, 0x7e, 0xef, 0xf1, 0x1f, 0x35, 0xa8, 0x24, 0x8b, 0x35, 0xf7,
+	0xba, 0x39, 0x20, 0xc7, 0x7d, 0xf3, 0xe9, 0xc9, 0x58, 0x06, 0xc1, 0xe8, 0xbc, 0xcb, 0x5d, 0x66,
+	0xf0, 0x21, 0x01, 0x41, 0x4d, 0x1e, 0x7a, 0x6c, 0x6c, 0x86, 0xef, 0xa5, 0xb0, 0xc1, 0x50, 0xc9,
+	0xcd, 0x72, 0xe5, 0x15, 0x68, 0x60, 0x3c, 0xc4, 0x7a, 0x0e, 0x7d, 0x00, 0x4d, 0x85, 0x70, 0xbf,
+	0x62, 0x6c, 0x74, 0xc7, 0xe4, 0xac, 0xf3, 0xdd, 0x29, 0x77, 0xbb, 0x0c, 0xb2, 0x91, 0x9e, 0x47,
+	0xef, 0xc2, 0x5e, 0xcc, 0xb5, 0x2e, 0x2e, 0x1e, 0x7f, 0x0e, 0xf5, 0xbb, 0x82, 0x1e, 0x01, 0x14,
+	0x46, 0xc6, 0x78, 0xdc, 0x37, 0xe4, 0x60, 0x73, 0x2c, 0x03, 0x17, 0xa0, 0x80, 0x8d, 0xd1, 0xf9,
+	0xa9, 0xa1, 0x67, 0x0e, 0xff, 0x5a, 0x84, 0x82, 0x98, 0xb4, 0x03, 0xf4, 0x15, 0x54, 0x13, 0x8f,
+	0x4d, 0x2f, 0x0e, 0xd1, 0x83, 0xd7, 0x3e, 0x43, 0x35, 0xa2, 0x2b, 0xbb, 0x82, 0x0f, 0x34, 0x74,
+	0x04, 0xb5, 0xe4, 0xab, 0xcb, 0x8b, 0x43, 0x94, 0x1c, 0x50, 0xd7, 0x3c, 0xc8, 0xac, 0x91, 0xf1,
+	0x1c, 0x74, 0x23, 0x64, 0xce, 0x9c, 0xf7, 0x49, 0xf5, 0x2e, 0x82, 0x1a, 0xc9, 0x04, 0x4f, 0x3f,
+	0xb6, 0x34, 0xf6, 0xd6, 0xd2, 0x54, 0xc9, 0xf9, 0x9a, 0xcf, 0x24, 0xf1, 0xcb, 0xc4, 0x2d, 0x83,
+	0xd2, 0xcf, 0x21, 0x8d, 0x77, 0xee, 0x22, 0xab, 0xd7, 0x84, 0xec, 0xef, 0x32, 0xdc, 0xc6, 0x6a,
+	0x82, 0xb6, 0xe6, 0x94, 0x6e, 0x08, 0x5d, 0xd3, 0xb9, 0x91, 0x0d, 0xdb, 0x6b, 0x5e, 0x2d, 0xd0,
+	0x87, 0xe9, 0x3a, 0x76, 0xc7, 0x9b, 0x47, 0xe3, 0xe1, 0x9b, 0xd8, 0x94, 0xf1, 0x36, 0x6c, 0xaf,
+	0x79, 0xde, 0x48, 0xed, 0x72, 0xf7, 0xe3, 0x48, 0x6a, 0x97, 0xd7, 0xbd, 0x92, 0x7c, 0x0f, 0xfa,
+	0xcd, 0xdb, 0x30, 0x6a, 0xdd, 0x5c, 0x7b, 0xfb, 0x5a, 0xde, 0x78, 0xff, 0xb5, 0x3c, 0x4a, 0xb8,
+	0x09, 0xb0, 0xba, 0x30, 0xa2, 0xfb, 0x89, 0x25, 0xb7, 0xee, 0xc4, 0x8d, 0x07, 0x77, 0x50, 0x95,
+	0xa8, 0x31, 0x6c, 0xaf, 0xb9, 0x41, 0xa6, 0x4e, 0xe3, 0xee, 0x1b, 0x66, 0x63, 0x67, 0xdd, 0x45,
+	0xeb, 0x40, 0x43, 0xa7, 0x32, 0xc0, 0xa2, 0x17, 0xd4, 0x37, 0x64, 0x4c, 0x7d, 0xfd, 0x40, 0xb8,
+	0x0c, 0x45, 0x68, 0x1d, 0x68, 0x68, 0x08, 0x95, 0x64, 0x96, 0xbc, 0x31, 0x7d, 0xde, 0x28, 0x70,
+	0x0a, 0x9b, 0xa9, 0x66, 0xec, 0x07, 0xe8, 0xd1, 0x1b, 0x47, 0x0a, 0x79, 0x62, 0xa9, 0x08, 0x78,
+	0xcd, 0xec, 0xd1, 0xd6, 0x0e, 0xb4, 0xa3, 0x4f, 0x7e, 0xf9, 0xe4, 0xd2, 0x61, 0xb3, 0xe5, 0xc5,
+	0xfe, 0xc4, 0x9f, 0x3f, 0x11, 0x0f, 0xa4, 0x9e, 0xe3, 0x5d, 0x7a, 0x94, 0xbd, 0xf2, 0x83, 0xab,
+	0x27, 0xae, 0x67, 0x3f, 0x11, 0x69, 0xf0, 0x24, 0x16, 0x79, 0x51, 0x10, 0x7f, 0x42, 0xf9, 0xd1,
+	0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xbf, 0xfc, 0xb7, 0xb8, 0x72, 0x19, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/lnrpc/routerrpc/router.proto b/lnrpc/routerrpc/router.proto
index db02607c1..8aecab8b3 100644
--- a/lnrpc/routerrpc/router.proto
+++ b/lnrpc/routerrpc/router.proto
@@ -137,6 +137,9 @@ message SendPaymentRequest {
     */
     int32 final_cltv_delta = 4;
 
+    // An optional payment addr to be included within the last hop of the route.
+    bytes payment_addr = 20;
+
     /*
     A bare-bones invoice for a payment within the Lightning Network.  With the
     details of the invoice, the sender has all the data necessary to send a
diff --git a/lnrpc/routerrpc/router.swagger.json b/lnrpc/routerrpc/router.swagger.json
index 806fdfd33..0c630f19e 100644
--- a/lnrpc/routerrpc/router.swagger.json
+++ b/lnrpc/routerrpc/router.swagger.json
@@ -1249,6 +1249,11 @@
           "format": "int32",
           "description": "The CLTV delta from the current height that should be used to set the\ntimelock for the final hop."
         },
+        "payment_addr": {
+          "type": "string",
+          "format": "byte",
+          "description": "An optional payment addr to be included within the last hop of the route."
+        },
         "payment_request": {
           "type": "string",
           "description": "A bare-bones invoice for a payment within the Lightning Network.  With the\ndetails of the invoice, the sender has all the data necessary to send a\npayment to the recipient. The amount in the payment request may be zero. In\nthat case it is required to set the amt field as well. If no payment request\nis specified, the following fields are required: dest, amt and payment_hash."
diff --git a/lnrpc/routerrpc/router_backend.go b/lnrpc/routerrpc/router_backend.go
index 4d1638d60..74775fc5c 100644
--- a/lnrpc/routerrpc/router_backend.go
+++ b/lnrpc/routerrpc/router_backend.go
@@ -695,6 +695,15 @@ func (r *RouterBackend) extractIntentFromSendRequest(
 			return nil, err
 		}
 
+		// If the payment addresses is specified, then we'll also
+		// populate that now as well.
+		if len(rpcPayReq.PaymentAddr) != 0 {
+			var payAddr [32]byte
+			copy(payAddr[:], rpcPayReq.PaymentAddr)
+
+			payIntent.PaymentAddr = &payAddr
+		}
+
 		payIntent.DestFeatures = features
 	}