Repository: lightningnetwork/lnd
Pull request #5027 (2021-02-15 21:26:59)

v0.12.1-beta.rc4
Included PRs since v0.12.1-beta.rc3:
 - #5021 
 - #5020 
 - #5019 
 - #5023 
 - #5016 
 - #5026
 - #5017


Patch:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 704f406e4..0f40d5209 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -73,10 +73,10 @@ jobs:
             curl https://keybase.io/roasbeef/pgp_keys.asc | gpg --import
             ```
 
-            Once you have the required PGP keys, you can verify the release (assuming `manifest-roasbeef-${{ env.RELEASE_VERSION }}.txt.asc` is in the current directory) with:
+            Once you have the required PGP keys, you can verify the release (assuming `manifest-roasbeef-${{ env.RELEASE_VERSION }}.sig` and `manifest-${{ env.RELEASE_VERSION }}.txt` are in the current directory) with:
 
             ```
-            gpg --verify manifest-roasbeef-${{ env.RELEASE_VERSION }}.txt.asc
+            gpg --verify manifest-roasbeef-${{ env.RELEASE_VERSION }}.sig manifest-${{ env.RELEASE_VERSION }}.txt
             ```
 
             You should see the following if the verification was successful:
@@ -95,7 +95,7 @@ jobs:
 
             Assuming you have the opentimestamps client installed locally, the timestamps can be verified with the following commands: 
             ```
-            ots verify manifest-roasbeef-${{ env.RELEASE_VERSION }}.txt.asc.ots -f manifest-roasbeef-${{ env.RELEASE_VERSION }}.txt.asc
+            ots verify manifest-roasbeef-${{ env.RELEASE_VERSION }}.sig.ots -f manifest-roasbeef-${{ env.RELEASE_VERSION }}.sig
             ```
 
             Alternatively, [the open timestamps website](https://opentimestamps.org/) can be used to verify timestamps if one doesn't have a `bitcoind` instance accessible locally. 
diff --git a/build/version.go b/build/version.go
index ff5bbe1e0..b16925173 100644
--- a/build/version.go
+++ b/build/version.go
@@ -48,7 +48,7 @@ const (
 
 	// AppPreRelease MUST only contain characters from semanticAlphabet
 	// per the semantic versioning spec.
-	AppPreRelease = "beta.rc3"
+	AppPreRelease = "beta.rc4"
 )
 
 func init() {
diff --git a/cmd/lncli/cmd_pay.go b/cmd/lncli/cmd_pay.go
index 3c017e2a9..cb05c46bb 100644
--- a/cmd/lncli/cmd_pay.go
+++ b/cmd/lncli/cmd_pay.go
@@ -14,12 +14,14 @@ import (
 	"strings"
 	"time"
 
+	"github.com/btcsuite/btcutil"
 	"github.com/jedib0t/go-pretty/table"
 	"github.com/jedib0t/go-pretty/text"
 	"github.com/lightninglabs/protobuf-hex-display/jsonpb"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
 	"github.com/lightningnetwork/lnd/lntypes"
+	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/lightningnetwork/lnd/record"
 	"github.com/lightningnetwork/lnd/routing/route"
 	"github.com/urfave/cli"
@@ -62,7 +64,7 @@ var (
 		Name: "max_parts",
 		Usage: "the maximum number of partial payments that may be " +
 			"used",
-		Value: 1,
+		Value: routerrpc.DefaultMaxParts,
 	}
 
 	jsonFlag = cli.BoolFlag{
@@ -71,6 +73,20 @@ var (
 			"messages. Set by default on Windows because table " +
 			"formatting is unsupported.",
 	}
+
+	maxShardSizeSatFlag = cli.UintFlag{
+		Name: "max_shard_size_sat",
+		Usage: "the largest payment split that should be attempted if " +
+			"payment splitting is required to attempt a payment, " +
+			"specified in satoshis",
+	}
+
+	maxShardSizeMsatFlag = cli.UintFlag{
+		Name: "max_shard_size_msat",
+		Usage: "the largest payment split that should be attempted if " +
+			"payment splitting is required to attempt a payment, " +
+			"specified in milli-satoshis",
+	}
 )
 
 // paymentFlags returns common flags for sendpayment and payinvoice.
@@ -115,6 +131,7 @@ func paymentFlags() []cli.Flag {
 			Usage: "allow sending a circular payment to self",
 		},
 		dataFlag, inflightUpdatesFlag, maxPartsFlag, jsonFlag,
+		maxShardSizeSatFlag, maxShardSizeMsatFlag,
 	}
 }
 
@@ -354,6 +371,23 @@ func sendPaymentRequest(ctx *cli.Context,
 
 	req.MaxParts = uint32(ctx.Uint(maxPartsFlag.Name))
 
+	switch {
+	// If the max shard size is specified, then it should either be in sat
+	// or msat, but not both.
+	case ctx.Uint64(maxShardSizeMsatFlag.Name) != 0 &&
+		ctx.Uint64(maxShardSizeSatFlag.Name) != 0:
+		return fmt.Errorf("only --max_split_size_msat or " +
+			"--max_split_size_sat should be set, but not both")
+
+	case ctx.Uint64(maxShardSizeMsatFlag.Name) != 0:
+		req.MaxShardSizeMsat = ctx.Uint64(maxShardSizeMsatFlag.Name)
+
+	case ctx.Uint64(maxShardSizeSatFlag.Name) != 0:
+		req.MaxShardSizeMsat = uint64(lnwire.NewMSatFromSatoshis(
+			btcutil.Amount(ctx.Uint64(maxShardSizeSatFlag.Name)),
+		))
+	}
+
 	// Parse custom data records.
 	data := ctx.String(dataFlag.Name)
 	if data != "" {
diff --git a/config.go b/config.go
index c70ab04f6..d3ab9b481 100644
--- a/config.go
+++ b/config.go
@@ -633,6 +633,7 @@ func ValidateConfig(cfg Config, usageMessage string) (*Config, error) {
 	cfg.Tor.PrivateKeyPath = CleanAndExpandPath(cfg.Tor.PrivateKeyPath)
 	cfg.Tor.WatchtowerKeyPath = CleanAndExpandPath(cfg.Tor.WatchtowerKeyPath)
 	cfg.Watchtower.TowerDir = CleanAndExpandPath(cfg.Watchtower.TowerDir)
+	cfg.BackupFilePath = CleanAndExpandPath(cfg.BackupFilePath)
 
 	// Create the lnd directory and all other sub directories if they don't
 	// already exist. This makes sure that directory trees are also created
diff --git a/docs/release.md b/docs/release.md
index 8b364fda6..42f2b8df3 100644
--- a/docs/release.md
+++ b/docs/release.md
@@ -99,11 +99,11 @@ script in the image that can be called (before starting the container for
 example):
 
 ```shell
-$ docker pull lightninglabs/lnd:v0.12.0-beta
-$ docker run --rm --entrypoint="" lightninglabs/lnd:v0.12.0-beta /verify-install.sh
-$ OK=$?
-$ if [ "$OK" -ne "0" ]; then echo "Verification failed!"; exit 1; done
-$ docker run lightninglabs/lnd [command-line options]
+⛰  docker pull lightninglabs/lnd:v0.12.0-beta
+⛰  docker run --rm --entrypoint="" lightninglabs/lnd:v0.12.0-beta /verify-install.sh
+⛰  OK=$?
+⛰  if [ "$OK" -ne "0" ]; then echo "Verification failed!"; exit 1; done
+⛰  docker run lightninglabs/lnd [command-line options]
 ```
 
 # Signing an Existing Manifest File
@@ -121,8 +121,6 @@ signature during signing.
 
 Assuming `USERNAME` is your current nick as a developer, then the following
 command will generate a proper signature:
+```shell
+⛰  gpg --detach-sig --output manifest-USERNAME-TAG.sig manifest-TAG.txt
 ```
-gpg --detach-sig --output manifest-USERNAME-TAG.txt.asc --clear-sign manifest-TAG.txt
-```
-
-
diff --git a/htlcswitch/mock.go b/htlcswitch/mock.go
index 69277bc31..d3e9167e6 100644
--- a/htlcswitch/mock.go
+++ b/htlcswitch/mock.go
@@ -74,6 +74,13 @@ type mockFeeEstimator struct {
 	quit chan struct{}
 }
 
+func newMockFeeEstimator() *mockFeeEstimator {
+	return &mockFeeEstimator{
+		byteFeeIn: make(chan chainfee.SatPerKWeight),
+		quit:      make(chan struct{}),
+	}
+}
+
 func (m *mockFeeEstimator) EstimateFeePerKW(
 	numBlocks uint32) (chainfee.SatPerKWeight, error) {
 
diff --git a/lnrpc/routerrpc/router.pb.go b/lnrpc/routerrpc/router.pb.go
index 7d454125c..47d39a39c 100644
--- a/lnrpc/routerrpc/router.pb.go
+++ b/lnrpc/routerrpc/router.pb.go
@@ -322,7 +322,13 @@ type SendPaymentRequest struct {
 	//
 	//If set, only the final payment update is streamed back. Intermediate updates
 	//that show which htlcs are still in flight are suppressed.
-	NoInflightUpdates    bool     `protobuf:"varint,18,opt,name=no_inflight_updates,json=noInflightUpdates,proto3" json:"no_inflight_updates,omitempty"`
+	NoInflightUpdates bool `protobuf:"varint,18,opt,name=no_inflight_updates,json=noInflightUpdates,proto3" json:"no_inflight_updates,omitempty"`
+	//
+	//The largest payment split that should be attempted when making a payment if
+	//splitting is necessary. Setting this value will effectively cause lnd to
+	//split more aggressively, vs only when it thinks it needs to. Note that this
+	//value is in milli-satoshis.
+	MaxShardSizeMsat     uint64   `protobuf:"varint,21,opt,name=max_shard_size_msat,json=maxShardSizeMsat,proto3" json:"max_shard_size_msat,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -494,6 +500,13 @@ func (m *SendPaymentRequest) GetNoInflightUpdates() bool {
 	return false
 }
 
+func (m *SendPaymentRequest) GetMaxShardSizeMsat() uint64 {
+	if m != nil {
+		return m.MaxShardSizeMsat
+	}
+	return 0
+}
+
 type TrackPaymentRequest struct {
 	// The hash of the payment to look up.
 	PaymentHash []byte `protobuf:"bytes,1,opt,name=payment_hash,json=paymentHash,proto3" json:"payment_hash,omitempty"`
@@ -2046,171 +2059,173 @@ func init() {
 func init() { proto.RegisterFile("routerrpc/router.proto", fileDescriptor_7a0613f69d37b0a5) }
 
 var fileDescriptor_7a0613f69d37b0a5 = []byte{
-	// 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,
+	// 2651 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x59, 0x4b, 0x77, 0xdb, 0xc6,
+	0xf5, 0x0f, 0xf8, 0x12, 0x79, 0xf9, 0x10, 0x34, 0x94, 0x2d, 0xfe, 0x29, 0x3b, 0x61, 0x98, 0x87,
+	0x79, 0xfc, 0x4f, 0x64, 0x45, 0xed, 0x69, 0xd3, 0xe6, 0xd1, 0x50, 0x24, 0x64, 0xc1, 0xa6, 0x48,
+	0x66, 0x48, 0x39, 0x49, 0xb3, 0x98, 0x42, 0xc4, 0x50, 0x44, 0x05, 0x02, 0x2c, 0x30, 0xb4, 0xad,
+	0xec, 0xba, 0xeb, 0xe9, 0x87, 0xe9, 0x27, 0xe8, 0x39, 0xed, 0xa2, 0xdd, 0xf4, 0x4b, 0x74, 0xdb,
+	0x4f, 0xd0, 0x75, 0xcf, 0x0c, 0x06, 0x20, 0x20, 0x52, 0x56, 0x7b, 0xda, 0x8d, 0x4d, 0xfc, 0xee,
+	0x9d, 0x3b, 0xf7, 0xde, 0xb9, 0xaf, 0x19, 0xc1, 0x7d, 0xcf, 0x5d, 0x32, 0xea, 0x79, 0x8b, 0xc9,
+	0x93, 0xe0, 0xd7, 0xc1, 0xc2, 0x73, 0x99, 0x8b, 0x0a, 0x11, 0x5e, 0x2f, 0x78, 0x8b, 0x49, 0x80,
+	0x36, 0xff, 0xba, 0x05, 0x68, 0x44, 0x1d, 0x73, 0x68, 0x5c, 0xcf, 0xa9, 0xc3, 0x30, 0xfd, 0xcd,
+	0x92, 0xfa, 0x0c, 0x21, 0xc8, 0x98, 0xd4, 0x67, 0x35, 0xa5, 0xa1, 0xb4, 0x4a, 0x58, 0xfc, 0x46,
+	0x2a, 0xa4, 0x8d, 0x39, 0xab, 0xa5, 0x1a, 0x4a, 0x2b, 0x8d, 0xf9, 0x4f, 0xf4, 0x7f, 0x90, 0x37,
+	0xe6, 0x8c, 0xcc, 0x7d, 0x83, 0xd5, 0x4a, 0x02, 0xde, 0x32, 0xe6, 0xec, 0xcc, 0x37, 0x18, 0x7a,
+	0x17, 0x4a, 0x8b, 0x40, 0x24, 0x99, 0x19, 0xfe, 0xac, 0x96, 0x16, 0x82, 0x8a, 0x12, 0x3b, 0x35,
+	0xfc, 0x19, 0x6a, 0x81, 0x3a, 0xb5, 0x1c, 0xc3, 0x26, 0x13, 0x9b, 0xbd, 0x24, 0x26, 0xb5, 0x99,
+	0x51, 0xcb, 0x34, 0x94, 0x56, 0x16, 0x57, 0x04, 0xde, 0xb1, 0xd9, 0xcb, 0x2e, 0x47, 0xe3, 0xc2,
+	0x0c, 0xd3, 0xf4, 0x6a, 0xbb, 0x09, 0x61, 0x6d, 0xd3, 0xf4, 0xd0, 0x23, 0xd8, 0x0e, 0x59, 0xbc,
+	0xc0, 0x86, 0x5a, 0xb6, 0xa1, 0xb4, 0x0a, 0xb8, 0xb2, 0x48, 0x5a, 0xf6, 0x08, 0xb6, 0x99, 0x35,
+	0xa7, 0xee, 0x92, 0x11, 0x9f, 0x4e, 0x5c, 0xc7, 0xf4, 0x6b, 0xb9, 0x60, 0x53, 0x09, 0x8f, 0x02,
+	0x14, 0x35, 0xa1, 0x3c, 0xa5, 0x94, 0xd8, 0xd6, 0xdc, 0x62, 0x84, 0x5b, 0xb8, 0x25, 0x2c, 0x2c,
+	0x4e, 0x29, 0xed, 0x71, 0x6c, 0x64, 0x30, 0xf4, 0x3e, 0x54, 0x56, 0x3c, 0xc2, 0x0d, 0x65, 0xc1,
+	0x54, 0x0a, 0x99, 0x84, 0x2f, 0x0e, 0x40, 0x75, 0x97, 0xec, 0xd2, 0xb5, 0x9c, 0x4b, 0x32, 0x99,
+	0x19, 0x0e, 0xb1, 0xcc, 0x5a, 0xbe, 0xa1, 0xb4, 0x32, 0xc7, 0x99, 0x9a, 0x72, 0xa8, 0xe0, 0x4a,
+	0x48, 0xed, 0xcc, 0x0c, 0x47, 0x37, 0xd1, 0x63, 0xd8, 0xb9, 0xc9, 0xef, 0xd7, 0xaa, 0x8d, 0x74,
+	0x2b, 0x83, 0xb7, 0x93, 0xac, 0x3e, 0xfa, 0x10, 0xb6, 0x6d, 0xc3, 0x67, 0x64, 0xe6, 0x2e, 0xc8,
+	0x62, 0x79, 0x71, 0x45, 0xaf, 0x6b, 0x15, 0xe1, 0x9d, 0x32, 0x87, 0x4f, 0xdd, 0xc5, 0x50, 0x80,
+	0xe8, 0x21, 0x80, 0x70, 0xb3, 0x50, 0xb5, 0x56, 0x10, 0x16, 0x17, 0x38, 0x22, 0xd4, 0x44, 0x9f,
+	0x40, 0x51, 0x84, 0x07, 0x99, 0x59, 0x0e, 0xf3, 0x6b, 0xd0, 0x48, 0xb7, 0x8a, 0x47, 0xea, 0x81,
+	0xed, 0xf0, 0x48, 0xc1, 0x9c, 0x72, 0x6a, 0x39, 0x0c, 0x83, 0x17, 0xfe, 0xf4, 0x91, 0x09, 0x55,
+	0x1e, 0x16, 0x64, 0xb2, 0xf4, 0x99, 0x3b, 0x27, 0x1e, 0x9d, 0xb8, 0x9e, 0xe9, 0xd7, 0x8a, 0x62,
+	0xe9, 0x8f, 0x0f, 0xa2, 0x68, 0x3b, 0x58, 0x0f, 0xaf, 0x83, 0x2e, 0xf5, 0x59, 0x47, 0xac, 0xc3,
+	0xc1, 0x32, 0xcd, 0x61, 0xde, 0x35, 0xde, 0x31, 0x6f, 0xe2, 0xe8, 0x23, 0x40, 0x86, 0x6d, 0xbb,
+	0xaf, 0x88, 0x4f, 0xed, 0x29, 0x91, 0x67, 0x59, 0xdb, 0x6e, 0x28, 0xad, 0x3c, 0x56, 0x05, 0x65,
+	0x44, 0xed, 0xa9, 0x14, 0x8f, 0x7e, 0x02, 0x65, 0xa1, 0xd3, 0x94, 0x1a, 0x6c, 0xe9, 0x51, 0xbf,
+	0xa6, 0x36, 0xd2, 0xad, 0xca, 0xd1, 0x8e, 0x34, 0xe4, 0x24, 0x80, 0x8f, 0x2d, 0x86, 0x4b, 0x9c,
+	0x4f, 0x7e, 0xfb, 0x68, 0x1f, 0x0a, 0x73, 0xe3, 0x35, 0x59, 0x18, 0x1e, 0xf3, 0x6b, 0x3b, 0x0d,
+	0xa5, 0x55, 0xc6, 0xf9, 0xb9, 0xf1, 0x7a, 0xc8, 0xbf, 0xd1, 0x01, 0x54, 0x1d, 0x97, 0x58, 0xce,
+	0xd4, 0xb6, 0x2e, 0x67, 0x8c, 0x2c, 0x17, 0xa6, 0xc1, 0xa8, 0x5f, 0x43, 0x42, 0x87, 0x1d, 0xc7,
+	0xd5, 0x25, 0xe5, 0x3c, 0x20, 0xa0, 0x8f, 0xa1, 0xca, 0x85, 0xf9, 0x33, 0xc3, 0x33, 0x89, 0x6f,
+	0xfd, 0x40, 0x83, 0xc8, 0xb8, 0xc7, 0x4f, 0x1c, 0xab, 0x73, 0xe3, 0xf5, 0x88, 0x53, 0x46, 0xd6,
+	0x0f, 0x94, 0x47, 0x47, 0xbd, 0x0b, 0xf7, 0x37, 0xbb, 0x83, 0x27, 0x1c, 0x3f, 0x4f, 0x45, 0x2c,
+	0xe4, 0x3f, 0xd1, 0x2e, 0x64, 0x5f, 0x1a, 0xf6, 0x92, 0x8a, 0x24, 0x2c, 0xe1, 0xe0, 0xe3, 0xe7,
+	0xa9, 0x4f, 0x95, 0xe6, 0x0c, 0xaa, 0x63, 0xcf, 0x98, 0x5c, 0xdd, 0xc8, 0xe3, 0x9b, 0x69, 0xa8,
+	0xac, 0xa7, 0xe1, 0x2d, 0xe6, 0xa5, 0x6e, 0x31, 0xaf, 0xf9, 0x25, 0x6c, 0x8b, 0x80, 0x38, 0xa1,
+	0xf4, 0x4d, 0xd5, 0x62, 0x0f, 0x78, 0x2d, 0x10, 0x89, 0x13, 0x54, 0x8c, 0x9c, 0x31, 0xe7, 0x39,
+	0xd3, 0x34, 0x41, 0x5d, 0xad, 0xf7, 0x17, 0xae, 0xe3, 0x53, 0x5e, 0x0a, 0x78, 0xbc, 0xf0, 0x80,
+	0xe7, 0xf9, 0x24, 0xfc, 0xa5, 0x88, 0x55, 0x15, 0x89, 0x9f, 0x50, 0xe1, 0x2d, 0x1e, 0xef, 0x3c,
+	0x4f, 0x89, 0xed, 0x4e, 0xae, 0x78, 0xcd, 0x30, 0xae, 0xa5, 0xf8, 0x32, 0x87, 0x7b, 0xee, 0xe4,
+	0xaa, 0xcb, 0xc1, 0xe6, 0xf7, 0x41, 0x59, 0x1b, 0xbb, 0x62, 0xaf, 0xff, 0xc0, 0x1d, 0x4d, 0xc8,
+	0x8a, 0xd0, 0x15, 0x62, 0x8b, 0x47, 0xa5, 0x78, 0x0e, 0xe0, 0x80, 0xd4, 0xfc, 0x1e, 0xaa, 0x09,
+	0xe1, 0xd2, 0x8a, 0x3a, 0xe4, 0x17, 0x1e, 0xb5, 0xe6, 0xc6, 0x25, 0x95, 0x92, 0xa3, 0x6f, 0xd4,
+	0x82, 0xad, 0xa9, 0x61, 0xd9, 0x4b, 0x2f, 0x14, 0x5c, 0x09, 0x63, 0x32, 0x40, 0x71, 0x48, 0x6e,
+	0x3e, 0x80, 0x3a, 0xa6, 0x3e, 0x65, 0x67, 0x96, 0xef, 0x5b, 0xae, 0xd3, 0x71, 0x1d, 0xe6, 0xb9,
+	0xb6, 0xb4, 0xa0, 0xf9, 0x10, 0xf6, 0x37, 0x52, 0x03, 0x15, 0xf8, 0xe2, 0xaf, 0x97, 0xd4, 0xbb,
+	0xde, 0xbc, 0xf8, 0x6b, 0xd8, 0xdf, 0x48, 0x95, 0xfa, 0x7f, 0x04, 0xd9, 0x85, 0x61, 0x79, 0xfc,
+	0xec, 0x79, 0x0e, 0xdf, 0x8f, 0xe5, 0xf0, 0xd0, 0xb0, 0xbc, 0x53, 0xcb, 0x67, 0xae, 0x77, 0x8d,
+	0x03, 0xa6, 0x67, 0x99, 0xbc, 0xa2, 0xa6, 0x9a, 0xbf, 0x57, 0xa0, 0x18, 0x23, 0xf2, 0x4c, 0x72,
+	0x5c, 0x93, 0x92, 0xa9, 0xe7, 0xce, 0x43, 0x27, 0x70, 0xe0, 0xc4, 0x73, 0xe7, 0x3c, 0x26, 0x04,
+	0x91, 0xb9, 0x32, 0x80, 0x73, 0xfc, 0x73, 0xec, 0xa2, 0x8f, 0x61, 0x6b, 0x16, 0x08, 0x10, 0x55,
+	0xb6, 0x78, 0x54, 0xbd, 0xb1, 0x77, 0xd7, 0x60, 0x06, 0x0e, 0x79, 0x9e, 0x65, 0xf2, 0x69, 0x35,
+	0xf3, 0x2c, 0x93, 0xcf, 0xa8, 0xd9, 0x67, 0x99, 0x7c, 0x56, 0xcd, 0x3d, 0xcb, 0xe4, 0x73, 0xea,
+	0x56, 0xf3, 0x1f, 0x0a, 0xe4, 0x43, 0x6e, 0xae, 0x09, 0x77, 0x29, 0xe1, 0x71, 0x21, 0x83, 0x29,
+	0xcf, 0x81, 0xb1, 0x35, 0xa7, 0xa8, 0x01, 0x25, 0x41, 0x4c, 0x86, 0x28, 0x70, 0xac, 0x2d, 0xc2,
+	0x54, 0x94, 0xff, 0x90, 0x43, 0xc4, 0x63, 0x46, 0x96, 0xff, 0x80, 0x25, 0x6c, 0x72, 0xfe, 0x72,
+	0x32, 0xa1, 0xbe, 0x1f, 0xec, 0x92, 0x0d, 0x58, 0x24, 0x26, 0x36, 0xfa, 0x10, 0xb6, 0x43, 0x96,
+	0x70, 0xaf, 0x5c, 0x10, 0xaf, 0x12, 0x96, 0xdb, 0xb5, 0x40, 0x8d, 0xf3, 0xcd, 0x57, 0x0d, 0xa7,
+	0xb2, 0x62, 0xe4, 0x9b, 0x06, 0xc6, 0x37, 0x7f, 0x0d, 0x7b, 0xe2, 0x28, 0x87, 0x9e, 0x7b, 0x61,
+	0x5c, 0x58, 0xb6, 0xc5, 0xae, 0xc3, 0x20, 0xe7, 0x86, 0x7b, 0xee, 0x9c, 0x70, 0xdf, 0x86, 0x47,
+	0xc0, 0x81, 0xbe, 0x6b, 0x52, 0x7e, 0x04, 0xcc, 0x0d, 0x48, 0xf2, 0x08, 0x98, 0x2b, 0x08, 0xf1,
+	0x5e, 0x9e, 0x4e, 0xf4, 0xf2, 0xe6, 0x15, 0xd4, 0xd6, 0xf7, 0x92, 0x31, 0xd3, 0x80, 0xe2, 0x62,
+	0x05, 0x8b, 0xed, 0x14, 0x1c, 0x87, 0xe2, 0x67, 0x9b, 0xba, 0xfb, 0x6c, 0x9b, 0x7f, 0x53, 0x60,
+	0xe7, 0x78, 0x69, 0xd9, 0x66, 0x22, 0x71, 0xe3, 0xda, 0x29, 0xc9, 0x49, 0x63, 0xd3, 0x18, 0x91,
+	0xda, 0x38, 0x46, 0x7c, 0xb4, 0xa1, 0x0f, 0xa7, 0x45, 0x1f, 0x4e, 0x6d, 0xe8, 0xc2, 0xef, 0x40,
+	0x71, 0xd5, 0x54, 0xfd, 0x5a, 0xa6, 0x91, 0x6e, 0x95, 0x30, 0xcc, 0xc2, 0x8e, 0xea, 0xaf, 0x4d,
+	0x25, 0xd9, 0xb5, 0xa9, 0xa4, 0xf9, 0x29, 0xa0, 0xb8, 0x2d, 0xd2, 0x67, 0x51, 0x89, 0x51, 0x6e,
+	0x2f, 0x31, 0x0f, 0xa0, 0x3e, 0x5a, 0x5e, 0xf8, 0x13, 0xcf, 0xba, 0xa0, 0xa7, 0xcc, 0x9e, 0x68,
+	0x2f, 0xa9, 0xc3, 0xfc, 0x30, 0x91, 0xff, 0x99, 0x81, 0x42, 0x84, 0xf2, 0x0a, 0x6e, 0x39, 0x13,
+	0x77, 0x1e, 0xda, 0xe5, 0x50, 0x9b, 0x9b, 0x16, 0xf4, 0x8d, 0x9d, 0x90, 0xd4, 0x09, 0x28, 0xba,
+	0xc9, 0xf9, 0x13, 0x7e, 0x90, 0xfc, 0xa9, 0x80, 0x3f, 0xee, 0x86, 0x80, 0xbf, 0x05, 0x6a, 0x24,
+	0x7f, 0xc6, 0xec, 0x49, 0xe4, 0x37, 0x5c, 0x09, 0x71, 0xae, 0x4c, 0xc0, 0x19, 0x49, 0x0e, 0x39,
+	0x33, 0x01, 0x67, 0x88, 0x4b, 0xce, 0x77, 0xa1, 0xc4, 0x53, 0xc6, 0x67, 0xc6, 0x7c, 0x41, 0x1c,
+	0x5f, 0x38, 0x2f, 0x83, 0x8b, 0x11, 0xd6, 0xf7, 0xd1, 0x17, 0x00, 0x94, 0xdb, 0x47, 0xd8, 0xf5,
+	0x82, 0x8a, 0xac, 0xa9, 0x1c, 0xbd, 0x1d, 0x8b, 0x9d, 0xc8, 0x01, 0x07, 0xe2, 0xdf, 0xf1, 0xf5,
+	0x82, 0xe2, 0x02, 0x0d, 0x7f, 0xa2, 0x2f, 0xa1, 0x3c, 0x75, 0xbd, 0x57, 0xbc, 0x09, 0x0b, 0x50,
+	0x56, 0x96, 0xbd, 0x98, 0x84, 0x93, 0x80, 0x2e, 0x96, 0x9f, 0xbe, 0x85, 0x4b, 0xd3, 0xd8, 0x37,
+	0x7a, 0x0e, 0x28, 0x5c, 0x2f, 0x0a, 0x41, 0x20, 0x24, 0x2f, 0x84, 0xec, 0xaf, 0x0b, 0xe1, 0x75,
+	0x3c, 0x14, 0xa4, 0x4e, 0x6f, 0x60, 0xe8, 0x33, 0x28, 0xf9, 0x94, 0x31, 0x9b, 0x4a, 0x31, 0x05,
+	0x21, 0xe6, 0x7e, 0x62, 0x4a, 0xe2, 0xe4, 0x50, 0x42, 0xd1, 0x5f, 0x7d, 0xa2, 0x63, 0xd8, 0xb6,
+	0x2d, 0xe7, 0x2a, 0xae, 0x06, 0x88, 0xf5, 0xb5, 0xd8, 0xfa, 0x9e, 0xe5, 0x5c, 0xc5, 0x75, 0x28,
+	0xdb, 0x71, 0xa0, 0xf9, 0x39, 0x14, 0x22, 0x2f, 0xa1, 0x22, 0x6c, 0x9d, 0xf7, 0x9f, 0xf7, 0x07,
+	0xdf, 0xf4, 0xd5, 0xb7, 0x50, 0x1e, 0x32, 0x23, 0xad, 0xdf, 0x55, 0x15, 0x0e, 0x63, 0xad, 0xa3,
+	0xe9, 0x2f, 0x34, 0x35, 0xc5, 0x3f, 0x4e, 0x06, 0xf8, 0x9b, 0x36, 0xee, 0xaa, 0xe9, 0xe3, 0x2d,
+	0xc8, 0x8a, 0x7d, 0x9b, 0x7f, 0x54, 0x20, 0x2f, 0x4e, 0xd0, 0x99, 0xba, 0xe8, 0xff, 0x21, 0x0a,
+	0x2e, 0x51, 0xff, 0x78, 0x4f, 0x16, 0x51, 0x57, 0xc6, 0x51, 0xc0, 0x8c, 0x25, 0xce, 0x99, 0xa3,
+	0xd0, 0x88, 0x98, 0x53, 0x01, 0x73, 0x48, 0x88, 0x98, 0x1f, 0xc7, 0x24, 0x27, 0xaa, 0x52, 0x06,
+	0x6f, 0x87, 0x84, 0xb0, 0x08, 0xc7, 0xa7, 0xe5, 0x44, 0xb1, 0x8e, 0x4d, 0xcb, 0x92, 0xb7, 0xf9,
+	0x53, 0x28, 0xc5, 0xcf, 0x1c, 0x3d, 0x82, 0x8c, 0xe5, 0x4c, 0x5d, 0x99, 0x88, 0xd5, 0x1b, 0xc1,
+	0xc5, 0x8d, 0xc4, 0x82, 0xa1, 0x89, 0x40, 0xbd, 0x79, 0xce, 0xcd, 0x32, 0x14, 0x63, 0x87, 0xd6,
+	0xfc, 0xbb, 0x02, 0xe5, 0xc4, 0x21, 0xfc, 0xdb, 0xd2, 0xd1, 0x17, 0x50, 0x7a, 0x65, 0x79, 0x94,
+	0xc4, 0x27, 0x84, 0xca, 0x51, 0x3d, 0x39, 0x21, 0x84, 0xff, 0x77, 0x5c, 0x93, 0xe2, 0x22, 0xe7,
+	0x97, 0x00, 0xfa, 0x05, 0x54, 0xe4, 0x4a, 0x62, 0x52, 0x66, 0x58, 0xb6, 0x70, 0x55, 0x25, 0x11,
+	0x1e, 0x92, 0xb7, 0x2b, 0xe8, 0xb8, 0x3c, 0x8d, 0x7f, 0xa2, 0x0f, 0x56, 0x02, 0x7c, 0xe6, 0x59,
+	0xce, 0xa5, 0xf0, 0x5f, 0x21, 0x62, 0x1b, 0x09, 0x90, 0xf7, 0xfa, 0xb2, 0x9c, 0x2f, 0x47, 0xcc,
+	0x60, 0x4b, 0x3e, 0xea, 0x66, 0x7d, 0x66, 0xc8, 0x4a, 0x56, 0x49, 0xe4, 0x56, 0x8c, 0x91, 0xe2,
+	0x80, 0x2b, 0x31, 0x20, 0xa5, 0xd6, 0x06, 0xa4, 0x2c, 0xaf, 0x18, 0x41, 0xa1, 0x2d, 0x1e, 0x21,
+	0x69, 0xfc, 0xe9, 0xb8, 0xd7, 0x69, 0x33, 0x46, 0xe7, 0x0b, 0x86, 0x03, 0x06, 0xd9, 0x00, 0xbf,
+	0x04, 0xe8, 0x58, 0xde, 0x64, 0x69, 0xb1, 0xe7, 0xf4, 0x9a, 0xb7, 0xb5, 0xb0, 0xa2, 0x07, 0x65,
+	0x2f, 0x37, 0x09, 0xaa, 0xf8, 0x1e, 0x6c, 0x85, 0x85, 0x28, 0xa8, 0x6f, 0xb9, 0x99, 0x28, 0x40,
+	0xcd, 0x3f, 0x65, 0x60, 0x5f, 0x1e, 0x69, 0x70, 0x1a, 0x8c, 0x7a, 0x13, 0xba, 0x88, 0x26, 0xe7,
+	0xa7, 0xb0, 0xbb, 0x2a, 0xaa, 0xc1, 0x46, 0x24, 0x9c, 0xc6, 0x8b, 0x47, 0xf7, 0x62, 0x96, 0xae,
+	0xd4, 0xc0, 0x28, 0x2a, 0xb6, 0x2b, 0xd5, 0x0e, 0x63, 0x82, 0x8c, 0xb9, 0xbb, 0x74, 0x64, 0x88,
+	0x06, 0x15, 0x0f, 0xad, 0xc2, 0x99, 0x93, 0x44, 0x44, 0x3f, 0x82, 0x28, 0xc8, 0x09, 0x7d, 0xbd,
+	0xb0, 0xbc, 0x6b, 0x51, 0xfd, 0xca, 0xab, 0x72, 0xab, 0x09, 0x74, 0x6d, 0x9c, 0x4d, 0xad, 0x8f,
+	0xb3, 0x9f, 0x41, 0x3d, 0xca, 0x0e, 0x79, 0x31, 0xa6, 0x66, 0xd4, 0xfd, 0xb6, 0x84, 0x0e, 0x7b,
+	0x21, 0x07, 0x0e, 0x19, 0x64, 0x0b, 0x3c, 0x84, 0xdd, 0x58, 0x6a, 0xad, 0x54, 0x0f, 0x32, 0x11,
+	0xad, 0xb2, 0x2b, 0xae, 0x7a, 0xb4, 0x42, 0xaa, 0x9e, 0x09, 0x54, 0x0f, 0x61, 0xa9, 0xfa, 0xaf,
+	0xa0, 0x72, 0xe3, 0xe2, 0x98, 0x17, 0xe7, 0xfe, 0xb3, 0xf5, 0xca, 0xba, 0xe9, 0x78, 0x0e, 0x36,
+	0xdc, 0x1e, 0xcb, 0x93, 0xc4, 0xcd, 0xf1, 0x21, 0x80, 0xeb, 0x58, 0xae, 0x43, 0x2e, 0x6c, 0xf7,
+	0x42, 0x14, 0xdc, 0x12, 0x2e, 0x08, 0xe4, 0xd8, 0x76, 0x2f, 0xea, 0x5f, 0x01, 0xfa, 0x2f, 0xaf,
+	0x5c, 0x7f, 0x56, 0xe0, 0xc1, 0x66, 0x15, 0x65, 0x9f, 0xff, 0x9f, 0x85, 0xd0, 0x67, 0x90, 0x33,
+	0x26, 0xcc, 0x72, 0x1d, 0x59, 0x19, 0xde, 0x8b, 0x2d, 0xc5, 0xd4, 0x77, 0xed, 0x97, 0xf4, 0xd4,
+	0xb5, 0x4d, 0xa9, 0x4c, 0x5b, 0xb0, 0x62, 0xb9, 0x24, 0x91, 0x74, 0xe9, 0x64, 0xd2, 0x3d, 0xfe,
+	0x6d, 0x06, 0xca, 0x89, 0xca, 0x90, 0x6c, 0x0d, 0x65, 0x28, 0xf4, 0x07, 0xa4, 0xab, 0x8d, 0xdb,
+	0x7a, 0x4f, 0x55, 0x90, 0x0a, 0xa5, 0x41, 0x5f, 0x1f, 0xf4, 0x49, 0x57, 0xeb, 0x0c, 0xba, 0xbc,
+	0x49, 0xdc, 0x83, 0x9d, 0x9e, 0xde, 0x7f, 0x4e, 0xfa, 0x83, 0x31, 0xd1, 0x7a, 0xfa, 0x53, 0xfd,
+	0xb8, 0xa7, 0xa9, 0x69, 0xb4, 0x0b, 0xea, 0xa0, 0x4f, 0x3a, 0xa7, 0x6d, 0xbd, 0x4f, 0xc6, 0xfa,
+	0x99, 0x36, 0x38, 0x1f, 0xab, 0x19, 0x8e, 0xf2, 0x6c, 0x26, 0xda, 0xb7, 0x1d, 0x4d, 0xeb, 0x8e,
+	0xc8, 0x59, 0xfb, 0x5b, 0x35, 0x8b, 0x6a, 0xb0, 0xab, 0xf7, 0x47, 0xe7, 0x27, 0x27, 0x7a, 0x47,
+	0xd7, 0xfa, 0x63, 0x72, 0xdc, 0xee, 0xb5, 0xfb, 0x1d, 0x4d, 0xcd, 0xa1, 0xfb, 0x80, 0xf4, 0x7e,
+	0x67, 0x70, 0x36, 0xec, 0x69, 0x63, 0x8d, 0x84, 0xcd, 0x68, 0x0b, 0x55, 0x61, 0x5b, 0xc8, 0x69,
+	0x77, 0xbb, 0xe4, 0xa4, 0xad, 0xf7, 0xb4, 0xae, 0x9a, 0xe7, 0x9a, 0x48, 0x8e, 0x11, 0xe9, 0xea,
+	0xa3, 0xf6, 0x31, 0x87, 0x0b, 0x7c, 0x4f, 0xbd, 0xff, 0x62, 0xa0, 0x77, 0x34, 0xd2, 0xe1, 0x62,
+	0x39, 0x0a, 0x9c, 0x39, 0x44, 0xcf, 0xfb, 0x5d, 0x0d, 0x0f, 0xdb, 0x7a, 0x57, 0x2d, 0xa2, 0x7d,
+	0xd8, 0x0b, 0x61, 0xed, 0xdb, 0xa1, 0x8e, 0xbf, 0x23, 0xe3, 0xc1, 0x80, 0x8c, 0x06, 0x83, 0xbe,
+	0x5a, 0x8a, 0x4b, 0xe2, 0xd6, 0x0e, 0x86, 0x5a, 0x5f, 0x2d, 0xa3, 0x3d, 0xa8, 0x9e, 0x0d, 0x87,
+	0x24, 0xa4, 0x84, 0xc6, 0x56, 0x38, 0x7b, 0xbb, 0xdb, 0xc5, 0xda, 0x68, 0x44, 0xce, 0xf4, 0xd1,
+	0x59, 0x7b, 0xdc, 0x39, 0x55, 0xb7, 0xb9, 0x49, 0x23, 0x6d, 0x4c, 0xc6, 0x83, 0x71, 0xbb, 0xb7,
+	0xc2, 0x55, 0xae, 0xd0, 0x0a, 0xe7, 0x9b, 0xf6, 0x06, 0xdf, 0xa8, 0x3b, 0xdc, 0xe1, 0x1c, 0x1e,
+	0xbc, 0x90, 0x2a, 0x22, 0x6e, 0xbb, 0x3c, 0x9e, 0x70, 0x4f, 0xb5, 0xca, 0x41, 0xbd, 0xff, 0xa2,
+	0xdd, 0xd3, 0xbb, 0xe4, 0xb9, 0xf6, 0x9d, 0x68, 0xe6, 0xbb, 0x1c, 0x0c, 0x34, 0x23, 0x43, 0x3c,
+	0x78, 0xca, 0x15, 0x51, 0xef, 0x21, 0x04, 0x95, 0x8e, 0x8e, 0x3b, 0xe7, 0xbd, 0x36, 0x26, 0x78,
+	0x70, 0x3e, 0xd6, 0xd4, 0xfb, 0x8f, 0xff, 0xa0, 0x40, 0x29, 0x5e, 0xac, 0xf9, 0xa9, 0xeb, 0x7d,
+	0x72, 0xd2, 0xd3, 0x9f, 0x9e, 0x8e, 0x83, 0x20, 0x18, 0x9d, 0x77, 0xf8, 0x91, 0x69, 0x7c, 0x48,
+	0x40, 0x50, 0x09, 0x9c, 0x1e, 0x19, 0x9b, 0xe2, 0x7b, 0x49, 0xac, 0x3f, 0x90, 0x72, 0xd3, 0x5c,
+	0x79, 0x09, 0x6a, 0x18, 0x0f, 0xb0, 0x9a, 0x41, 0xef, 0x43, 0x43, 0x22, 0xfc, 0x5c, 0x31, 0xd6,
+	0x3a, 0x63, 0x32, 0x6c, 0x7f, 0x77, 0xc6, 0x8f, 0x3d, 0x08, 0xb2, 0x91, 0x9a, 0x45, 0xef, 0xc0,
+	0x7e, 0xc4, 0xb5, 0x29, 0x2e, 0x1e, 0x7f, 0x0e, 0xb5, 0xdb, 0x82, 0x1e, 0x01, 0xe4, 0x46, 0xda,
+	0x78, 0xdc, 0xd3, 0x82, 0xc1, 0xe6, 0x24, 0x08, 0x5c, 0x80, 0x1c, 0xd6, 0x46, 0xe7, 0x67, 0x9a,
+	0x9a, 0x3a, 0xfa, 0x4b, 0x1e, 0x72, 0x62, 0xd2, 0xf6, 0xd0, 0x57, 0x50, 0x8e, 0xbd, 0x4d, 0xbd,
+	0x38, 0x42, 0x0f, 0xdf, 0xf8, 0x6a, 0x55, 0x0f, 0xaf, 0xec, 0x12, 0x3e, 0x54, 0xd0, 0x31, 0x54,
+	0xe2, 0xaf, 0x2e, 0x2f, 0x8e, 0x50, 0x7c, 0x40, 0xdd, 0xf0, 0x20, 0xb3, 0x41, 0xc6, 0x73, 0x50,
+	0x35, 0x9f, 0x59, 0x73, 0xde, 0x27, 0xe5, 0xbb, 0x08, 0xaa, 0xc7, 0x13, 0x3c, 0xf9, 0xd8, 0x52,
+	0xdf, 0xdf, 0x48, 0x93, 0x25, 0xe7, 0x6b, 0x3e, 0x93, 0x44, 0x2f, 0x13, 0x6b, 0x06, 0x25, 0x9f,
+	0x43, 0xea, 0x6f, 0xdf, 0x46, 0x96, 0xaf, 0x09, 0xe9, 0xdf, 0xa5, 0xb8, 0x8d, 0xe5, 0x18, 0x6d,
+	0x83, 0x97, 0x6e, 0x08, 0xdd, 0xd0, 0xb9, 0x91, 0x09, 0xd5, 0x0d, 0xaf, 0x16, 0xe8, 0x83, 0x64,
+	0x1d, 0xbb, 0xe5, 0xcd, 0xa3, 0xfe, 0xe1, 0x5d, 0x6c, 0xd2, 0x78, 0x13, 0xaa, 0x1b, 0x9e, 0x37,
+	0x12, 0xbb, 0xdc, 0xfe, 0x38, 0x92, 0xd8, 0xe5, 0x4d, 0xaf, 0x24, 0xdf, 0x83, 0x7a, 0xf3, 0x36,
+	0x8c, 0x9a, 0x37, 0xd7, 0xae, 0x5f, 0xcb, 0xeb, 0xef, 0xbd, 0x91, 0x47, 0x0a, 0xd7, 0x01, 0x56,
+	0x17, 0x46, 0xf4, 0x20, 0xb6, 0x64, 0xed, 0x4e, 0x5c, 0x7f, 0x78, 0x0b, 0x55, 0x8a, 0x1a, 0x43,
+	0x75, 0xc3, 0x0d, 0x32, 0xe1, 0x8d, 0xdb, 0x6f, 0x98, 0xf5, 0xdd, 0x4d, 0x17, 0xad, 0x43, 0x05,
+	0x9d, 0x05, 0x01, 0x16, 0x3e, 0xb8, 0xde, 0x91, 0x31, 0xb5, 0xcd, 0x03, 0xe1, 0xd2, 0x17, 0xa1,
+	0x75, 0xa8, 0xa0, 0x01, 0x94, 0xe2, 0x59, 0x72, 0x67, 0xfa, 0xdc, 0x29, 0x70, 0x0a, 0xdb, 0x89,
+	0x66, 0xec, 0x7a, 0xe8, 0xd1, 0x9d, 0x23, 0x45, 0xe0, 0xb1, 0x44, 0x04, 0xbc, 0x61, 0xf6, 0x68,
+	0x29, 0x87, 0xca, 0xf1, 0x27, 0xbf, 0x7c, 0x72, 0x69, 0xb1, 0xd9, 0xf2, 0xe2, 0x60, 0xe2, 0xce,
+	0x9f, 0x88, 0x07, 0x52, 0xc7, 0x72, 0x2e, 0x1d, 0xca, 0x5e, 0xb9, 0xde, 0xd5, 0x13, 0xdb, 0x31,
+	0x9f, 0x88, 0x34, 0x78, 0x12, 0x89, 0xbc, 0xc8, 0x89, 0xbf, 0xb8, 0xfc, 0xe8, 0x5f, 0x01, 0x00,
+	0x00, 0xff, 0xff, 0x01, 0x72, 0x9d, 0x54, 0xa1, 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 8aecab8b3..6cb865963 100644
--- a/lnrpc/routerrpc/router.proto
+++ b/lnrpc/routerrpc/router.proto
@@ -240,6 +240,14 @@ message SendPaymentRequest {
     that show which htlcs are still in flight are suppressed.
     */
     bool no_inflight_updates = 18;
+
+    /*
+    The largest payment split that should be attempted when making a payment if
+    splitting is necessary. Setting this value will effectively cause lnd to
+    split more aggressively, vs only when it thinks it needs to. Note that this
+    value is in milli-satoshis.
+    */
+    uint64 max_shard_size_msat = 21;
 }
 
 message TrackPaymentRequest {
diff --git a/lnrpc/routerrpc/router.swagger.json b/lnrpc/routerrpc/router.swagger.json
index aac5761a5..6ff37b02d 100644
--- a/lnrpc/routerrpc/router.swagger.json
+++ b/lnrpc/routerrpc/router.swagger.json
@@ -1343,6 +1343,11 @@
           "type": "boolean",
           "format": "boolean",
           "description": "If set, only the final payment update is streamed back. Intermediate updates\nthat show which htlcs are still in flight are suppressed."
+        },
+        "max_shard_size_msat": {
+          "type": "string",
+          "format": "uint64",
+          "description": "The largest payment split that should be attempted when making a payment if\nsplitting is necessary. Setting this value will effectively cause lnd to\nsplit more aggressively, vs only when it thinks it needs to. Note that this\nvalue is in milli-satoshis."
         }
       }
     },
diff --git a/lnrpc/routerrpc/router_backend.go b/lnrpc/routerrpc/router_backend.go
index 922dec4ae..487947fdc 100644
--- a/lnrpc/routerrpc/router_backend.go
+++ b/lnrpc/routerrpc/router_backend.go
@@ -24,6 +24,15 @@ import (
 	"github.com/lightningnetwork/lnd/zpay32"
 )
 
+const (
+	// DefaultMaxParts is the default number of splits we'll possibly use
+	// for MPP when the user is attempting to send a payment.
+	//
+	// TODO(roasbeef): make this value dynamic based on expected number of
+	// attempts for given amount
+	DefaultMaxParts = 16
+)
+
 // RouterBackend contains the backend implementation of the router rpc sub
 // server calls.
 type RouterBackend struct {
@@ -547,14 +556,23 @@ func (r *RouterBackend) extractIntentFromSendRequest(
 	}
 	payIntent.CltvLimit = cltvLimit
 
-	// Take max htlcs from the request. Map zero to one for backwards
-	// compatibility.
+	// Attempt to parse the max parts value set by the user, if this value
+	// isn't set, then we'll use the current default value for this
+	// setting.
 	maxParts := rpcPayReq.MaxParts
 	if maxParts == 0 {
-		maxParts = 1
+		maxParts = DefaultMaxParts
 	}
 	payIntent.MaxParts = maxParts
 
+	// If this payment had a max shard amount specified, then we'll apply
+	// that now, which'll force us to always make payment splits smaller
+	// than this.
+	if rpcPayReq.MaxShardSizeMsat > 0 {
+		shardAmtMsat := lnwire.MilliSatoshi(rpcPayReq.MaxShardSizeMsat)
+		payIntent.MaxShardAmt = &shardAmtMsat
+	}
+
 	// Take fee limit from request.
 	payIntent.FeeLimit, err = lnrpc.UnmarshallAmt(
 		rpcPayReq.FeeLimitSat, rpcPayReq.FeeLimitMsat,
diff --git a/routing/payment_session.go b/routing/payment_session.go
index 4b766d4c0..586665834 100644
--- a/routing/payment_session.go
+++ b/routing/payment_session.go
@@ -230,6 +230,18 @@ func (p *paymentSession) RequestRoute(maxAmt, feeLimit lnwire.MilliSatoshi,
 
 	finalHtlcExpiry := int32(height) + int32(finalCltvDelta)
 
+	// Before we enter the loop below, we'll make sure to respect the max
+	// payment shard size (if it's set), which is effectively our
+	// client-side MTU that we'll attempt to respect at all times.
+	maxShardActive := p.payment.MaxShardAmt != nil
+	if maxShardActive && maxAmt > *p.payment.MaxShardAmt {
+		p.log.Debug("Clamping payment attempt from %v to %v due to "+
+			"max shard size of %v", maxAmt,
+			*p.payment.MaxShardAmt, maxAmt)
+
+		maxAmt = *p.payment.MaxShardAmt
+	}
+
 	for {
 		// We'll also obtain a set of bandwidthHints from the lower
 		// layer for each of our outbound channels. This will allow the
@@ -279,7 +291,8 @@ func (p *paymentSession) RequestRoute(maxAmt, feeLimit lnwire.MilliSatoshi,
 			}
 
 			if !p.payment.DestFeatures.HasFeature(lnwire.MPPOptional) {
-				p.log.Debug("not splitting because destination doesn't declare MPP")
+				p.log.Debug("not splitting because " +
+					"destination doesn't declare MPP")
 
 				return nil, errNoPathFound
 			}
diff --git a/routing/router.go b/routing/router.go
index 4c1aa2214..b308338a6 100644
--- a/routing/router.go
+++ b/routing/router.go
@@ -1684,6 +1684,14 @@ type LightningPayment struct {
 	// MaxParts is the maximum number of partial payments that may be used
 	// to complete the full amount.
 	MaxParts uint32
+
+	// MaxShardAmt is the largest shard that we'll attempt to split using.
+	// If this field is set, and we need to split, rather than attempting
+	// half of the original payment amount, we'll use this value if half
+	// the payment amount is greater than it.
+	//
+	// NOTE: This field is _optional_.
+	MaxShardAmt *lnwire.MilliSatoshi
 }
 
 // SendPayment attempts to send a payment as described within the passed
diff --git a/scripts/release.sh b/scripts/release.sh
index 6ff4c3b6b..930d680e3 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -183,7 +183,7 @@ function build_release() {
 
     # Add the hashes for the individual binaries as well for easy verification
     # of a single installed binary.
-    sha256sum "${dir}/"* >> "manifest-$tag.txt" 
+    shasum -a 256 "${dir}/"* >> "manifest-$tag.txt" 
 
     if [[ $os == "windows" ]]; then
       reproducible_zip "${dir}"
@@ -193,7 +193,7 @@ function build_release() {
   done
 
   # Add the hash of the packages too, then sort by the second column (name).
-  sha256sum lnd-* vendor* >> "manifest-$tag.txt"
+  shasum -a 256 lnd-* vendor* >> "manifest-$tag.txt"
   LC_ALL=C sort -k2 -o "manifest-$tag.txt" "manifest-$tag.txt"
   cat "manifest-$tag.txt"
 }
diff --git a/scripts/verify-install.sh b/scripts/verify-install.sh
index fcf287e45..3a7290e79 100755
--- a/scripts/verify-install.sh
+++ b/scripts/verify-install.sh
@@ -5,7 +5,8 @@ PROJECT=lnd
 
 RELEASE_URL=https://github.com/$REPO/$PROJECT/releases
 API_URL=https://api.github.com/repos/$REPO/$PROJECT/releases
-SIGNATURE_SELECTOR=". | select(.name | test(\"manifest-.*(\\\\.txt\\\\.asc)$\")) | .name"
+MANIFEST_SELECTOR=". | select(.name | test(\"manifest-v.*(\\\\.txt)$\")) | .name"
+SIGNATURE_SELECTOR=". | select(.name | test(\"manifest-.*(\\\\.sig)$\")) | .name"
 HEADER_JSON="Accept: application/json"
 HEADER_GH_JSON="Accept: application/vnd.github.v3+json"
 
@@ -28,28 +29,68 @@ function check_command() {
   fi
 }
 
+# By default we're picking up lnd and lncli from the system $PATH.
+LND_BIN=$(which lnd)
+LNCLI_BIN=$(which lncli)
+
+# If exactly two parameters are specified, we expect the first one to be lnd and
+# the second one to be lncli.
+if [[ $# -eq 2 ]]; then
+  LND_BIN=$(realpath $1)
+  LNCLI_BIN=$(realpath $2)
+  
+  # Make sure both files actually exist.
+  if [[ ! -f $LND_BIN ]]; then
+    echo "ERROR: $LND_BIN not found!"
+    exit 1
+  fi
+  if [[ ! -f $LNCLI_BIN ]]; then
+    echo "ERROR: $LNCLI_BIN not found!"
+    exit 1
+  fi
+elif [[ $# -eq 0 ]]; then
+  # Make sure both binaries can be found and are executable.
+  check_command lnd
+  check_command lncli
+else
+  echo "ERROR: invalid number of parameters!"
+  echo "Usage: verify-install.sh [lnd-binary lncli-binary]"
+  exit 1
+fi
+
 check_command curl
 check_command jq
 check_command gpg
-check_command lnd
-check_command lncli
-
-LND_BIN=$(which lnd)
-LNCLI_BIN=$(which lncli)
 
-LND_VERSION=$(lnd --version | cut -d'=' -f2)
-LNCLI_VERSION=$(lncli --version | cut -d'=' -f2)
-LND_SUM=$(sha256sum $LND_BIN | cut -d' ' -f1)
-LNCLI_SUM=$(sha256sum $LNCLI_BIN | cut -d' ' -f1)
+LND_VERSION=$($LND_BIN --version | cut -d'=' -f2)
+LNCLI_VERSION=$($LNCLI_BIN --version | cut -d'=' -f2)
+LND_SUM=$(shasum -a 256 $LND_BIN | cut -d' ' -f1)
+LNCLI_SUM=$(shasum -a 256 $LNCLI_BIN | cut -d' ' -f1)
 
-echo "Detected lnd version $LND_VERSION with SHA256 sum $LND_SUM"
-echo "Detected lncli version $LNCLI_VERSION with SHA256 sum $LNCLI_SUM"
+echo "Detected lnd $LND_BIN version $LND_VERSION with SHA256 sum $LND_SUM"
+echo "Detected lncli $LNCLI_BIN version $LNCLI_VERSION with SHA256 sum $LNCLI_SUM"
 
-# Make sure lnd and lncli are installed with the same version.
+# Make sure lnd and lncli are installed with the same version and is an actual
+# version string.
 if [[ "$LNCLI_VERSION" != "$LND_VERSION" ]]; then
   echo "ERROR: Version $LNCLI_VERSION of lncli does not match $LND_VERSION of lnd!"
   exit 1
 fi
+version_regex="^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]"
+if [[ ! "$LND_VERSION" =~ $version_regex ]]; then
+  echo "ERROR: Invalid version of lnd detected: $LND_VERSION"
+  exit 1
+fi
+
+# Make sure the hash was actually calculated by looking at its length.
+if [[ ${#LND_SUM} -ne 64 ]]; then
+  echo "ERROR: Invalid hash for lnd: $LND_SUM!"
+  exit 1
+fi
+if [[ ${#LNCLI_SUM} -ne 64 ]]; then
+  echo "ERROR: Invalid hash for lncli: $LNCLI_SUM!"
+  exit 1
+fi
 
 # If we're inside the docker image, there should be a shasums.txt file in the
 # root directory. If that's the case, we first want to make sure we still have
@@ -89,13 +130,17 @@ TAG_NAME=$(echo $RELEASE_JSON | jq -r '.tag_name')
 RELEASE_ID=$(echo $RELEASE_JSON | jq -r '.id')
 echo "Release $TAG_NAME found with ID $RELEASE_ID"
 
-# Now download the asset list and filter by manifests and signatures.
+# Now download the asset list and filter by the manifest and the signatures.
 ASSETS=$(curl -L -s -H "$HEADER_GH_JSON" "$API_URL/$RELEASE_ID" | jq -c '.assets[]')
+MANIFEST=$(echo $ASSETS | jq -r "$MANIFEST_SELECTOR")
 SIGNATURES=$(echo $ASSETS | jq -r "$SIGNATURE_SELECTOR")
 
-# Download all "manifest-*.txt.asc" as those contain both the hashes that were
-# signed and the signature itself (=detached sig).
+# Download the main "manifest-*.txt" and all "manifest-*.sig" files containing
+# the detached signatures.
 TEMP_DIR=$(mktemp -d /tmp/lnd-sig-verification-XXXXXX)
+echo "Downloading $MANIFEST"
+curl -L -s -o "$TEMP_DIR/$MANIFEST" "$RELEASE_URL/download/$LND_VERSION/$MANIFEST"
+
 for signature in $SIGNATURES; do
   echo "Downloading $signature"
   curl -L -s -o "$TEMP_DIR/$signature" "$RELEASE_URL/download/$LND_VERSION/$signature"
@@ -104,49 +149,64 @@ done
 echo ""
 cd $TEMP_DIR || exit 1
 
+# Before we even look at the content of the manifest, we first want to make sure
+# the signatures actually sign that exact manifest.
 NUM_CHECKS=0
 for signature in $SIGNATURES; do
-  # First make sure the downloaded signature file is valid.
   echo "Verifying $signature"
-  if gpg --verify "$signature" 2>&1 | grep -q "Good signature"; then
-    echo "Signature for $signature checks out: "
-    gpg --verify "$signature" 2>&1 | grep "using"
+  if gpg --verify "$signature" "$MANIFEST" 2>&1 | grep -q "Good signature"; then
+    echo "Signature for $signature appears valid: "
+    gpg --verify "$signature" "$MANIFEST" 2>&1 | grep "using"
   elif gpg --verify "$signature" 2>&1 | grep -q "No public key"; then
     echo "Unable to verify signature $signature, no key available, skipping"
     continue
   else
-    echo "ERROR: Did not get valid signature for $signature!"
+    echo "ERROR: Did not get valid signature for $MANIFEST in $signature!"
+    echo "  The developer signature $signature disagrees on the expected"
+    echo "  release binaries in $MANIFEST. The release may have been faulty or"
+    echo "  was backdoored."
     exit 1
   fi
 
-  echo ""
-
-  # Then make sure that the hash of the installed binaries can be found in the
-  # signed list of hashes.
-  if ! grep -q "$LND_SUM" "$signature"; then
-    echo "ERROR: Hash $LND_SUM for lnd not found in $signature: "
-    cat "$signature"
-    exit 1
-  fi
-
-  if ! grep -q "$LNCLI_SUM" "$signature"; then
-    echo "ERROR: Hash $LNCLI_SUM for lncli not found in $signature: "
-    cat "$signature"
-    exit 1
-  fi
-
-  echo "Verified lnd and lncli hashes against $signature"
+  echo "Verified $signature against $MANIFEST"
   ((NUM_CHECKS=NUM_CHECKS+1))
 done
 
-# We want at least one signature that signs the hashes of the binaries we have
-# installed. If we arrive here without exiting, it means no signature manifests
-# were uploaded (yet) with the correct naming pattern.
-if [[ $NUM_CHECKS -lt 1 ]]; then
-  echo "ERROR: No valid signatures found!"
-  echo "Make sure the release $LND_VERSION contains any signed manifests."
+# We want at least five signatures (out of seven public keys) that sign the
+# hashes of the binaries we have installed. If we arrive here without exiting,
+# it means no signature manifests were uploaded (yet) with the correct naming
+# pattern.
+MIN_REQUIRED_SIGNATURES=5
+if [[ $NUM_CHECKS -lt $MIN_REQUIRED_SIGNATURES ]]; then
+  echo "ERROR: Not enough valid signatures found!"
+  echo "  Valid signatures found: $NUM_CHECKS"
+  echo "  Valid signatures required: $MIN_REQUIRED_SIGNATURES"
+  echo
+  echo "  Make sure the release $LND_VERSION contains the required "
+  echo "  number of signatures on the manifest, or wait until more "
+  echo "  signatures have been added to the release."
+  exit 1
+fi
+
+# Then make sure that the hash of the installed binaries can be found in the
+# manifest that we now have verified the signatures for.
+if ! grep -q "^$LND_SUM" "$MANIFEST"; then
+  echo "ERROR: Hash $LND_SUM for lnd not found in $MANIFEST: "
+  cat "$MANIFEST"
+  echo "  The expected release binaries have been verified with the developer "
+  echo "  signatures. Your binary's hash does not match the expected release "
+  echo "  binary hashes. Make sure you're using an official binary."
+  exit 1
+fi
+
+if ! grep -q "^$LNCLI_SUM" "$MANIFEST"; then
+  echo "ERROR: Hash $LNCLI_SUM for lncli not found in $MANIFEST: "
+  cat "$MANIFEST"
+  echo "  The expected release binaries have been verified with the developer "
+  echo "  signatures. Your binary's hash does not match the expected release "
+  echo "  binary hashes. Make sure you're using an official binary."
   exit 1
 fi
 
 echo ""
-echo "SUCCESS! Verified lnd and lncli against $NUM_CHECKS signature(s)."
+echo "SUCCESS! Verified lnd and lncli against $MANIFEST signed by $NUM_CHECKS developers."


Test patch:
diff --git a/htlcswitch/link_test.go b/htlcswitch/link_test.go
index e4ca32db7..3c0be7857 100644
--- a/htlcswitch/link_test.go
+++ b/htlcswitch/link_test.go
@@ -1967,6 +1967,7 @@ func newSingleLinkTestHarness(chanAmt, chanReserve btcutil.Amount) (
 			return nil
 		},
 		Registry:            invoiceRegistry,
+		FeeEstimator:        newMockFeeEstimator(),
 		ChainEvents:         &contractcourt.ChainEventSubscription{},
 		BatchTicker:         bticker,
 		FwdPkgGCTicker:      ticker.NewForce(15 * time.Second),
@@ -4469,6 +4470,7 @@ func (h *persistentLinkHarness) restartLink(
 			return nil
 		},
 		Registry:            h.coreLink.cfg.Registry,
+		FeeEstimator:        newMockFeeEstimator(),
 		ChainEvents:         &contractcourt.ChainEventSubscription{},
 		BatchTicker:         bticker,
 		FwdPkgGCTicker:      ticker.New(5 * time.Second),
diff --git a/htlcswitch/test_utils.go b/htlcswitch/test_utils.go
index 18cf31513..a1dd30a3d 100644
--- a/htlcswitch/test_utils.go
+++ b/htlcswitch/test_utils.go
@@ -1098,13 +1098,8 @@ func newHopNetwork() *hopNetwork {
 	}
 	obfuscator := NewMockObfuscator()
 
-	feeEstimator := &mockFeeEstimator{
-		byteFeeIn: make(chan chainfee.SatPerKWeight),
-		quit:      make(chan struct{}),
-	}
-
 	return &hopNetwork{
-		feeEstimator: feeEstimator,
+		feeEstimator: newMockFeeEstimator(),
 		globalPolicy: globalPolicy,
 		obfuscator:   obfuscator,
 		defaultDelta: defaultDelta,
diff --git a/lntest/itest/lnd_multi-hop-error-propagation_test.go b/lntest/itest/lnd_multi-hop-error-propagation_test.go
index e0a022801..6fc629218 100644
--- a/lntest/itest/lnd_multi-hop-error-propagation_test.go
+++ b/lntest/itest/lnd_multi-hop-error-propagation_test.go
@@ -204,6 +204,7 @@ out:
 		FinalCltvDelta: int32(carolPayReq.CltvExpiry),
 		TimeoutSeconds: 60,
 		FeeLimitMsat:   noFeeLimitMsat,
+		MaxParts:       1,
 	}
 	sendAndAssertFailure(
 		t, net.Alice,
@@ -240,6 +241,7 @@ out:
 		FinalCltvDelta: int32(carolPayReq.CltvExpiry),
 		TimeoutSeconds: 60,
 		FeeLimitMsat:   noFeeLimitMsat,
+		MaxParts:       1,
 	}
 	sendAndAssertFailure(
 		t, net.Alice,
@@ -300,6 +302,7 @@ out:
 				PaymentRequest: carolInvoice2.PaymentRequest,
 				TimeoutSeconds: 60,
 				FeeLimitMsat:   noFeeLimitMsat,
+				MaxParts:       1,
 			},
 		)
 
@@ -332,6 +335,7 @@ out:
 		PaymentRequest: carolInvoice3.PaymentRequest,
 		TimeoutSeconds: 60,
 		FeeLimitMsat:   noFeeLimitMsat,
+		MaxParts:       1,
 	}
 	sendAndAssertFailure(
 		t, net.Alice,
@@ -381,6 +385,7 @@ out:
 			PaymentRequest: carolInvoice.PaymentRequest,
 			TimeoutSeconds: 60,
 			FeeLimitMsat:   noFeeLimitMsat,
+			MaxParts:       1,
 		},
 		lnrpc.PaymentFailureReason_FAILURE_REASON_NO_ROUTE,
 	)
diff --git a/lntest/itest/log_error_whitelist.txt b/lntest/itest/log_error_whitelist.txt
index a8ac3398f..fbcc66cfd 100644
--- a/lntest/itest/log_error_whitelist.txt
+++ b/lntest/itest/log_error_whitelist.txt
@@ -254,3 +254,5 @@
 <time> [ERR] RPCS: [/lnrpc.Lightning/OpenChannel]: reserved wallet balance invalidated
 <time> [ERR] RPCS: [/lnrpc.Lightning/SendCoins]: reserved wallet balance invalidated
 <time> [ERR] RPCS: unable to open channel to NodeKey(<hex>): reserved wallet balance invalidated
+<time> [ERR] NANN: Unable to retrieve chan status for Channel(<chan_point>): unable to extract ChannelUpdate
+<time> [ERR] NTFN: Unable to rewind chain from height 1 to height -1: unable to find blockhash for disconnected height=<height>: -8: Block height out of range
diff --git a/routing/integrated_routing_context_test.go b/routing/integrated_routing_context_test.go
index fcd3d05b4..9fd0f663c 100644
--- a/routing/integrated_routing_context_test.go
+++ b/routing/integrated_routing_context_test.go
@@ -28,6 +28,7 @@ type integratedRoutingContext struct {
 	target *mockNode
 
 	amt         lnwire.MilliSatoshi
+	maxShardAmt *lnwire.MilliSatoshi
 	finalExpiry int32
 
 	mcCfg          MissionControlConfig
@@ -150,6 +151,10 @@ func (c *integratedRoutingContext) testPayment(maxParts uint32,
 		MaxParts:       maxParts,
 	}
 
+	if c.maxShardAmt != nil {
+		payment.MaxShardAmt = c.maxShardAmt
+	}
+
 	session, err := newPaymentSession(
 		&payment, getBandwidthHints,
 		func() (routingGraph, func(), error) {
diff --git a/routing/integrated_routing_test.go b/routing/integrated_routing_test.go
index 6764da5cf..80fefaf93 100644
--- a/routing/integrated_routing_test.go
+++ b/routing/integrated_routing_test.go
@@ -89,6 +89,7 @@ type mppSendTestCase struct {
 	graph           func(g *mockGraph)
 	expectedFailure bool
 	maxParts        uint32
+	maxShardSize    btcutil.Amount
 }
 
 const (
@@ -208,6 +209,33 @@ var mppTestCases = []mppSendTestCase{
 		expectedFailure:  true,
 		maxParts:         10,
 	},
+
+	// Test that if maxShardSize is set, then all attempts are below the
+	// max shard size, yet still sum up to the total payment amount. A
+	// payment of 30k satoshis with a max shard size of 10k satoshis should
+	// produce 3 payments of 10k sats each.
+	{
+		name:             "max shard size clamping",
+		graph:            onePathGraph,
+		amt:              30_000,
+		expectedAttempts: 3,
+		expectedSuccesses: []expectedHtlcSuccess{
+			{
+				amt:   10_000,
+				chans: []uint64{chanSourceIm1, chanIm1Target},
+			},
+			{
+				amt:   10_000,
+				chans: []uint64{chanSourceIm1, chanIm1Target},
+			},
+			{
+				amt:   10_000,
+				chans: []uint64{chanSourceIm1, chanIm1Target},
+			},
+		},
+		maxParts:     1000,
+		maxShardSize: 10_000,
+	},
 }
 
 // TestMppSend tests that a payment can be completed using multiple shards.
@@ -229,6 +257,11 @@ func testMppSend(t *testing.T, testCase *mppSendTestCase) {
 
 	ctx.amt = lnwire.NewMSatFromSatoshis(testCase.amt)
 
+	if testCase.maxShardSize != 0 {
+		shardAmt := lnwire.NewMSatFromSatoshis(testCase.maxShardSize)
+		ctx.maxShardAmt = &shardAmt
+	}
+
 	attempts, err := ctx.testPayment(testCase.maxParts)
 	switch {
 	case err == nil && testCase.expectedFailure: