diff --git a/bccsp/factory/factory_test.go b/bccsp/factory/factory_test.go
index b5441297b..f9f6b2b9e 100644
--- a/bccsp/factory/factory_test.go
+++ b/bccsp/factory/factory_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 
 	"github.com/hyperledger/fabric/bccsp/pkcs11"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/peer/main.go b/cmd/peer/main.go
index ff81c222b..e26025b8c 100644
--- a/cmd/peer/main.go
+++ b/cmd/peer/main.go
@@ -19,7 +19,7 @@ import (
 	"github.com/hyperledger/fabric/internal/peer/node"
 	"github.com/hyperledger/fabric/internal/peer/version"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 // The main command describes the service and
diff --git a/common/viperutil/config_test.go b/common/viperutil/config_test.go
index 1ce3dbab8..3b416be63 100644
--- a/common/viperutil/config_test.go
+++ b/common/viperutil/config_test.go
@@ -17,7 +17,7 @@ import (
 
 	"github.com/Shopify/sarama"
 	"github.com/hyperledger/fabric/orderer/mocks/util"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 const Prefix = "VIPERUTIL"
diff --git a/common/viperutil/config_util.go b/common/viperutil/config_util.go
index 8aab468fb..6a2372067 100644
--- a/common/viperutil/config_util.go
+++ b/common/viperutil/config_util.go
@@ -24,7 +24,7 @@ import (
 	"github.com/hyperledger/fabric/common/flogging"
 	"github.com/mitchellh/mapstructure"
 	"github.com/pkg/errors"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 var logger = flogging.MustGetLogger("viperutil")
diff --git a/core/chaincode/config.go b/core/chaincode/config.go
index 31eda0edc..1a9a85bb0 100644
--- a/core/chaincode/config.go
+++ b/core/chaincode/config.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/hyperledger/fabric/common/flogging"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 const (
diff --git a/core/chaincode/config_test.go b/core/chaincode/config_test.go
index dae7b6625..e0a4b662c 100644
--- a/core/chaincode/config_test.go
+++ b/core/chaincode/config_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hyperledger/fabric/core/chaincode"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 var _ = Describe("Config", func() {
diff --git a/core/chaincode/exectransaction_test.go b/core/chaincode/exectransaction_test.go
index a5d052a86..6b0c601af 100644
--- a/core/chaincode/exectransaction_test.go
+++ b/core/chaincode/exectransaction_test.go
@@ -66,7 +66,7 @@ import (
 	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 	msptesttools "github.com/hyperledger/fabric/msp/mgmt/testtools"
 	"github.com/hyperledger/fabric/protoutil"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
diff --git a/core/chaincode/executetransaction_pvtdata_test.go b/core/chaincode/executetransaction_pvtdata_test.go
index 3cef3686b..0a0696bcd 100644
--- a/core/chaincode/executetransaction_pvtdata_test.go
+++ b/core/chaincode/executetransaction_pvtdata_test.go
@@ -15,7 +15,7 @@ import (
 	pb "github.com/hyperledger/fabric-protos-go/peer"
 	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/peer"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/chaincode/platforms/golang/platform.go b/core/chaincode/platforms/golang/platform.go
index 8fa6418cd..b505928f4 100644
--- a/core/chaincode/platforms/golang/platform.go
+++ b/core/chaincode/platforms/golang/platform.go
@@ -26,7 +26,7 @@ import (
 	"github.com/hyperledger/fabric/core/chaincode/platforms/util"
 	"github.com/hyperledger/fabric/internal/ccmetadata"
 	"github.com/pkg/errors"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 // Platform for chaincodes written in Go
diff --git a/core/chaincode/platforms/golang/platform_test.go b/core/chaincode/platforms/golang/platform_test.go
index 1f20548b8..9afac4e16 100644
--- a/core/chaincode/platforms/golang/platform_test.go
+++ b/core/chaincode/platforms/golang/platform_test.go
@@ -23,7 +23,7 @@ import (
 	pb "github.com/hyperledger/fabric-protos-go/peer"
 	"github.com/hyperledger/fabric/core/chaincode/platforms/util"
 	"github.com/hyperledger/fabric/core/config/configtest"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/core/chaincode/platforms/java/platform_test.go b/core/chaincode/platforms/java/platform_test.go
index 37c55020d..5070e2130 100644
--- a/core/chaincode/platforms/java/platform_test.go
+++ b/core/chaincode/platforms/java/platform_test.go
@@ -21,7 +21,7 @@ import (
 	"github.com/hyperledger/fabric/core/chaincode/platforms/java"
 	"github.com/hyperledger/fabric/core/chaincode/platforms/util"
 	"github.com/hyperledger/fabric/core/config/configtest"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/core/chaincode/platforms/node/platform_test.go b/core/chaincode/platforms/node/platform_test.go
index efcff0499..2b2dd8417 100644
--- a/core/chaincode/platforms/node/platform_test.go
+++ b/core/chaincode/platforms/node/platform_test.go
@@ -17,7 +17,7 @@ import (
 
 	"github.com/hyperledger/fabric/core/chaincode/platforms/util"
 	"github.com/hyperledger/fabric/core/config/configtest"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/chaincode/platforms/platforms_test.go b/core/chaincode/platforms/platforms_test.go
index 1741f67df..d60a279ff 100644
--- a/core/chaincode/platforms/platforms_test.go
+++ b/core/chaincode/platforms/platforms_test.go
@@ -20,7 +20,7 @@ import (
 	"github.com/hyperledger/fabric/core/chaincode/platforms/util"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 var _ = Describe("Platforms", func() {
diff --git a/core/chaincode/platforms/util/utils.go b/core/chaincode/platforms/util/utils.go
index 7465342d0..ef25833d4 100644
--- a/core/chaincode/platforms/util/utils.go
+++ b/core/chaincode/platforms/util/utils.go
@@ -16,7 +16,7 @@ import (
 	docker "github.com/fsouza/go-dockerclient"
 	"github.com/hyperledger/fabric/common/flogging"
 	"github.com/hyperledger/fabric/common/metadata"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 var logger = flogging.MustGetLogger("chaincode.platform.util")
diff --git a/core/chaincode/platforms/util/utils_test.go b/core/chaincode/platforms/util/utils_test.go
index bc5b0081f..3dca1f037 100644
--- a/core/chaincode/platforms/util/utils_test.go
+++ b/core/chaincode/platforms/util/utils_test.go
@@ -19,7 +19,7 @@ import (
 	docker "github.com/fsouza/go-dockerclient"
 	"github.com/hyperledger/fabric/common/metadata"
 	"github.com/hyperledger/fabric/core/config/configtest"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/config/config.go b/core/config/config.go
index 473ec37f0..29fdbbb40 100644
--- a/core/config/config.go
+++ b/core/config/config.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 func dirExists(path string) bool {
diff --git a/core/config/config_test.go b/core/config/config_test.go
index 726592106..dfc63cb95 100644
--- a/core/config/config_test.go
+++ b/core/config/config_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/config/configtest/config.go b/core/config/configtest/config.go
index c4f952106..c7a7bdafa 100644
--- a/core/config/configtest/config.go
+++ b/core/config/configtest/config.go
@@ -11,7 +11,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/core/deliverservice/config.go b/core/deliverservice/config.go
index c393d4dc9..d4788d9ca 100644
--- a/core/deliverservice/config.go
+++ b/core/deliverservice/config.go
@@ -16,7 +16,7 @@ import (
 	"github.com/hyperledger/fabric/internal/pkg/peer/orderers"
 
 	"github.com/pkg/errors"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 const (
diff --git a/core/deliverservice/config_test.go b/core/deliverservice/config_test.go
index 1626f8687..a81919d38 100644
--- a/core/deliverservice/config_test.go
+++ b/core/deliverservice/config_test.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/hyperledger/fabric/core/comm"
 	"github.com/hyperledger/fabric/core/deliverservice"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 func TestSecureOptsConfig(t *testing.T) {
diff --git a/core/handlers/library/config.go b/core/handlers/library/config.go
index 711af59de..824a69448 100644
--- a/core/handlers/library/config.go
+++ b/core/handlers/library/config.go
@@ -8,7 +8,7 @@ package library
 
 import (
 	"github.com/mitchellh/mapstructure"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 // Config configures the factory methods
diff --git a/core/handlers/library/config_test.go b/core/handlers/library/config_test.go
index 26ae76046..c652c5657 100644
--- a/core/handlers/library/config_test.go
+++ b/core/handlers/library/config_test.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/core/ledger/kvledger/idstore/test_exports.go b/core/ledger/kvledger/idstore/test_exports.go
index 2a45eafc2..c99d8d02d 100644
--- a/core/ledger/kvledger/idstore/test_exports.go
+++ b/core/ledger/kvledger/idstore/test_exports.go
@@ -12,7 +12,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 
 	coreconfig "github.com/hyperledger/fabric/core/config"
 	"github.com/stretchr/testify/require"
diff --git a/core/peer/config.go b/core/peer/config.go
index af0eeabdf..c1f69b44e 100644
--- a/core/peer/config.go
+++ b/core/peer/config.go
@@ -31,7 +31,7 @@ import (
 	"github.com/hyperledger/fabric/core/comm"
 	"github.com/hyperledger/fabric/core/config"
 	"github.com/pkg/errors"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 // ExternalBuilder represents the configuration structure of
diff --git a/core/peer/config_test.go b/core/peer/config_test.go
index 0ca2cd346..2d2c7b46a 100644
--- a/core/peer/config_test.go
+++ b/core/peer/config_test.go
@@ -16,7 +16,7 @@ import (
 	"time"
 
 	"github.com/hyperledger/fabric/core/comm"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/scc/cscc/configure_test.go b/core/scc/cscc/configure_test.go
index 9fa15f877..6674750e9 100644
--- a/core/scc/cscc/configure_test.go
+++ b/core/scc/cscc/configure_test.go
@@ -46,7 +46,7 @@ import (
 	"github.com/hyperledger/fabric/msp/mgmt"
 	msptesttools "github.com/hyperledger/fabric/msp/mgmt/testtools"
 	"github.com/hyperledger/fabric/protoutil"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
diff --git a/core/scc/lscc/lscc_test.go b/core/scc/lscc/lscc_test.go
index a553df44f..754846c4c 100644
--- a/core/scc/lscc/lscc_test.go
+++ b/core/scc/lscc/lscc_test.go
@@ -16,7 +16,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric-chaincode-go/shim"
diff --git a/core/scc/qscc/query_test.go b/core/scc/qscc/query_test.go
index a20841a6d..8806fab2a 100644
--- a/core/scc/qscc/query_test.go
+++ b/core/scc/qscc/query_test.go
@@ -28,7 +28,7 @@ import (
 	xtestutil "github.com/hyperledger/fabric/extensions/testutil"
 	"github.com/hyperledger/fabric/protoutil"
 	"github.com/pkg/errors"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/core/testutil/config.go b/core/testutil/config.go
index c1eaa0150..feadca737 100644
--- a/core/testutil/config.go
+++ b/core/testutil/config.go
@@ -16,7 +16,7 @@ import (
 	"github.com/hyperledger/fabric/common/flogging"
 	"github.com/hyperledger/fabric/core/config/configtest"
 	"github.com/hyperledger/fabric/msp"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 var configLogger = flogging.MustGetLogger("config")
diff --git a/extensions/go.mod b/extensions/go.mod
index 638c964c8..dc82f74be 100644
--- a/extensions/go.mod
+++ b/extensions/go.mod
@@ -8,12 +8,12 @@ require (
 	github.com/hyperledger/fabric v2.0.0-alpha+incompatible
 	github.com/hyperledger/fabric-protos-go v0.0.0-20191121202242-f5500d5e3e85
 	github.com/pkg/errors v0.8.1
-	github.com/spf13/viper v1.3.2
+	github.com/spf13/viper2015 v1.3.2
 	github.com/stretchr/testify v1.4.0
 )
 
 replace github.com/hyperledger/fabric-protos-go => github.com/trustbloc/fabric-protos-go-ext v0.1.1-0.20191126151100-5a61374c2e1b
 
-replace github.com/spf13/viper => github.com/spf13/viper v0.0.0-20150908122457-1967d93db724
+replace github.com/spf13/viper2015 => github.com/spf13/viper v0.0.0-20150908122457-1967d93db724
 
 go 1.13
diff --git a/extensions/go.sum b/extensions/go.sum
index 44beeda8f..cef1e4a3c 100644
--- a/extensions/go.sum
+++ b/extensions/go.sum
@@ -26,6 +26,7 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/allegro/bigcache v1.1.1-0.20190116153254-84a0ff3f153c h1:JnxT952szw65TwPg7iz1iYVqEoikvX8mSkSgIhNr0Vo=
 github.com/allegro/bigcache v1.1.1-0.20190116153254-84a0ff3f153c/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
@@ -37,6 +38,8 @@ github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 h1:4BX8f882b
 github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc h1:TP+534wVlf61smEIq1nwLLAjQVEK2EADoW3CX9AuT+8=
 github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
+github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
@@ -109,6 +112,7 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf
 github.com/grpc-ecosystem/grpc-gateway v1.4.1/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
 github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
 github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/hyperledger/fabric-amcl v0.0.0-20181230093703-5ccba6eab8d6 h1:URjjUy3G6zNoODRpSy7FFzJyXh3J4+O5NJPgLY9lWT8=
@@ -137,6 +141,7 @@ github.com/kr/pty v1.0.0/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
@@ -176,6 +181,7 @@ github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59P
 github.com/opencontainers/runc v1.0.0-rc8 h1:dDCFes8Hj1r/i5qnypONo5jdOme/8HWZC/aNDyhECt0=
 github.com/opencontainers/runc v1.0.0-rc8/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pierrec/lz4 v0.0.0-20190501090746-d705d4371bfc h1:77NRNeSNvDmaA5797+73c8cSC4bqaLmm9XhtgcipJW0=
 github.com/pierrec/lz4 v0.0.0-20190501090746-d705d4371bfc/go.mod h1:g2rHQ0wsQlPM7GZ66p1EVBh+VdeJ8s60jWWxl1M9t1Q=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -210,10 +216,12 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
@@ -221,6 +229,7 @@ github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/viper v0.0.0-20150908122457-1967d93db724 h1:PC6V25yEKHIpaThJK1pn4eZ1iHQ9FKW1a/MWXewC/jo=
 github.com/spf13/viper v0.0.0-20150908122457-1967d93db724/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM=
+github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -239,10 +248,12 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1
 github.com/trustbloc/fabric-protos-go-ext v0.1.1-0.20191126151100-5a61374c2e1b h1:tM1brMvZspXKRSOp83gwKQL+5CGobSqHjh8XB1QM3tQ=
 github.com/trustbloc/fabric-protos-go-ext v0.1.1-0.20191126151100-5a61374c2e1b/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0=
 github.com/ugorji/go v1.1.1/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
+github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/urfave/cli v1.18.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/willf/bitset v1.1.10 h1:NotGKqX0KwQ72NUzqrjZq5ipPNDQex9lo3WpaS8L2sc=
 github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
 github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 go.etcd.io/bbolt v1.3.1-etcd.7/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd v0.0.0-20181228115726-23731bf9ba55/go.mod h1:weASp41xM3dk0YHg1s/W8ecdGP5G4teSTMBPpYAaUgA=
 go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4=
@@ -257,6 +268,7 @@ go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 golang.org/x/crypto v0.0.0-20180608092829-8ac0e0d97ce4/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4 h1:ydJNl0ENAG67pFbB+9tfhiL2pYqLhfoaZFw/cjLhY4A=
 golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -287,6 +299,7 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190310054646-10058d7d4faa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
diff --git a/extensions/storage/blkstorage/store_test.go b/extensions/storage/blkstorage/store_test.go
index c5904eb73..44e251a67 100644
--- a/extensions/storage/blkstorage/store_test.go
+++ b/extensions/storage/blkstorage/store_test.go
@@ -17,7 +17,7 @@ import (
 
 	"github.com/hyperledger/fabric/common/ledger/blkstorage"
 	coreconfig "github.com/hyperledger/fabric/core/config"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/extensions/storage/idstore/store_test.go b/extensions/storage/idstore/store_test.go
index 5d4915620..cff206d22 100644
--- a/extensions/storage/idstore/store_test.go
+++ b/extensions/storage/idstore/store_test.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/hyperledger/fabric/extensions/testutil"
 
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/extensions/storage/pvtdatastorage/store_test.go b/extensions/storage/pvtdatastorage/store_test.go
index 3d4a13b6f..6dfc85949 100644
--- a/extensions/storage/pvtdatastorage/store_test.go
+++ b/extensions/storage/pvtdatastorage/store_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/hyperledger/fabric/core/ledger"
 	"github.com/hyperledger/fabric/core/ledger/pvtdatastorage"
 	"github.com/hyperledger/fabric/extensions/testutil"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/extensions/storage/transientstore/store_test.go b/extensions/storage/transientstore/store_test.go
index 99568f69e..af10656b9 100644
--- a/extensions/storage/transientstore/store_test.go
+++ b/extensions/storage/transientstore/store_test.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/go.mod b/go.mod
index d055dc315..570232d9f 100644
--- a/go.mod
+++ b/go.mod
@@ -44,11 +44,10 @@ require (
 	github.com/pkg/errors v0.8.1
 	github.com/prometheus/client_golang v1.1.0
 	github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a
-	github.com/spf13/cast v1.3.0 // indirect
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.3
-	github.com/spf13/viper v1.3.2
+	github.com/spf13/viper2015 v1.3.2
 	github.com/stretchr/testify v1.4.0
 	github.com/sykesm/zap-logfmt v0.0.2
 	github.com/syndtr/goleveldb v0.0.0-20190625010220-02440ea7a285
@@ -74,6 +73,6 @@ replace github.com/hyperledger/fabric/extensions => ./extensions
 
 replace github.com/hyperledger/fabric-protos-go => github.com/trustbloc/fabric-protos-go-ext v0.1.1-0.20191126151100-5a61374c2e1b
 
-replace github.com/spf13/viper => github.com/spf13/viper v0.0.0-20150908122457-1967d93db724
+replace github.com/spf13/viper2015 => github.com/spf13/viper v0.0.0-20150908122457-1967d93db724
 
 go 1.13
diff --git a/go.sum b/go.sum
index dd94e7823..bae952e94 100644
--- a/go.sum
+++ b/go.sum
@@ -32,6 +32,7 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2c
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/allegro/bigcache v1.1.1-0.20190116153254-84a0ff3f153c h1:JnxT952szw65TwPg7iz1iYVqEoikvX8mSkSgIhNr0Vo=
 github.com/allegro/bigcache v1.1.1-0.20190116153254-84a0ff3f153c/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0=
@@ -46,6 +47,8 @@ github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 h1:4BX8f882b
 github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc h1:TP+534wVlf61smEIq1nwLLAjQVEK2EADoW3CX9AuT+8=
 github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
+github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 h1:u9SHYsPQNyt5tgDm3YN7+9dYrpK96E5wFilTFWIDZOM=
 github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
@@ -129,6 +132,7 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf
 github.com/grpc-ecosystem/grpc-gateway v1.4.1/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
 github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
 github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/hyperledger/fabric v2.0.0-alpha+incompatible/go.mod h1:tGFAOCT696D3rG0Vofd2dyWYLySHlh0aQjf7Q1HAju0=
@@ -160,6 +164,7 @@ github.com/kr/pty v1.0.0/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
@@ -203,6 +208,7 @@ github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59P
 github.com/opencontainers/runc v1.0.0-rc8 h1:dDCFes8Hj1r/i5qnypONo5jdOme/8HWZC/aNDyhECt0=
 github.com/opencontainers/runc v1.0.0-rc8/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pierrec/lz4 v0.0.0-20190501090746-d705d4371bfc h1:77NRNeSNvDmaA5797+73c8cSC4bqaLmm9XhtgcipJW0=
 github.com/pierrec/lz4 v0.0.0-20190501090746-d705d4371bfc/go.mod h1:g2rHQ0wsQlPM7GZ66p1EVBh+VdeJ8s60jWWxl1M9t1Q=
 github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
@@ -247,12 +253,14 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
@@ -260,6 +268,7 @@ github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/viper v0.0.0-20150908122457-1967d93db724 h1:PC6V25yEKHIpaThJK1pn4eZ1iHQ9FKW1a/MWXewC/jo=
 github.com/spf13/viper v0.0.0-20150908122457-1967d93db724/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM=
+github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -278,10 +287,12 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1
 github.com/trustbloc/fabric-protos-go-ext v0.1.1-0.20191126151100-5a61374c2e1b h1:tM1brMvZspXKRSOp83gwKQL+5CGobSqHjh8XB1QM3tQ=
 github.com/trustbloc/fabric-protos-go-ext v0.1.1-0.20191126151100-5a61374c2e1b/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0=
 github.com/ugorji/go v1.1.1/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
+github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/urfave/cli v1.18.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/willf/bitset v1.1.10 h1:NotGKqX0KwQ72NUzqrjZq5ipPNDQex9lo3WpaS8L2sc=
 github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
 github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 go.etcd.io/bbolt v1.3.1-etcd.7/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd v0.0.0-20181228115726-23731bf9ba55 h1://s+P7qX0faDdQVMorWv+j0omruIA7+Pvf7IH7B8JDg=
 go.etcd.io/etcd v0.0.0-20181228115726-23731bf9ba55/go.mod h1:weASp41xM3dk0YHg1s/W8ecdGP5G4teSTMBPpYAaUgA=
@@ -297,6 +308,7 @@ go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 golang.org/x/crypto v0.0.0-20180608092829-8ac0e0d97ce4/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4 h1:ydJNl0ENAG67pFbB+9tfhiL2pYqLhfoaZFw/cjLhY4A=
 golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -326,6 +338,7 @@ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190310054646-10058d7d4faa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
diff --git a/gossip/gossip/config.go b/gossip/gossip/config.go
index 457c169fc..ea9a471c2 100644
--- a/gossip/gossip/config.go
+++ b/gossip/gossip/config.go
@@ -17,7 +17,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/election"
 	"github.com/hyperledger/fabric/gossip/gossip/algo"
 	"github.com/hyperledger/fabric/gossip/util"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 // Config is the configuration of the gossip component
diff --git a/gossip/gossip/config_test.go b/gossip/gossip/config_test.go
index 12d044f6a..9739b2c35 100644
--- a/gossip/gossip/config_test.go
+++ b/gossip/gossip/config_test.go
@@ -21,7 +21,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/hyperledger/fabric/gossip/gossip"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 func TestGlobalConfig(t *testing.T) {
diff --git a/gossip/privdata/config.go b/gossip/privdata/config.go
index 2e26dc1e1..f26773146 100644
--- a/gossip/privdata/config.go
+++ b/gossip/privdata/config.go
@@ -9,7 +9,7 @@ package privdata
 import (
 	"time"
 
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 const (
diff --git a/gossip/privdata/config_test.go b/gossip/privdata/config_test.go
index cd3ef75a4..bbfe1e43e 100644
--- a/gossip/privdata/config_test.go
+++ b/gossip/privdata/config_test.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/hyperledger/fabric/gossip/privdata"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/gossip/service/config.go b/gossip/service/config.go
index 5e8511ca2..780977ea8 100644
--- a/gossip/service/config.go
+++ b/gossip/service/config.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/hyperledger/fabric/gossip/election"
 	"github.com/hyperledger/fabric/gossip/util"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 const (
diff --git a/gossip/service/config_test.go b/gossip/service/config_test.go
index 97b8a1042..251255b63 100644
--- a/gossip/service/config_test.go
+++ b/gossip/service/config_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/election"
 
 	"github.com/hyperledger/fabric/gossip/service"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/gossip/state/config.go b/gossip/state/config.go
index 3632095ce..e09e78dcd 100644
--- a/gossip/state/config.go
+++ b/gossip/state/config.go
@@ -9,7 +9,7 @@ package state
 import (
 	"time"
 
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 const (
diff --git a/gossip/state/config_test.go b/gossip/state/config_test.go
index ab46f3dc3..c0d58a6fc 100644
--- a/gossip/state/config_test.go
+++ b/gossip/state/config_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/state"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 func TestGlobalConfig(t *testing.T) {
diff --git a/gossip/util/misc.go b/gossip/util/misc.go
index de8500e2a..6034369a3 100644
--- a/gossip/util/misc.go
+++ b/gossip/util/misc.go
@@ -14,7 +14,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 func init() { // do we really need this?
diff --git a/gossip/util/misc_test.go b/gossip/util/misc_test.go
index aee3741af..1c9fd0426 100644
--- a/gossip/util/misc_test.go
+++ b/gossip/util/misc_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )
diff --git a/integration/pluggable/plugin_activation.go b/integration/pluggable/plugin_activation.go
index d3ec7981b..cbb94ff30 100644
--- a/integration/pluggable/plugin_activation.go
+++ b/integration/pluggable/plugin_activation.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 const (
diff --git a/internal/configtxgen/genesisconfig/config.go b/internal/configtxgen/genesisconfig/config.go
index a82637313..8afa97fe0 100644
--- a/internal/configtxgen/genesisconfig/config.go
+++ b/internal/configtxgen/genesisconfig/config.go
@@ -16,7 +16,7 @@ import (
 	"github.com/hyperledger/fabric/common/viperutil"
 	cf "github.com/hyperledger/fabric/core/config"
 	"github.com/hyperledger/fabric/msp"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 const (
diff --git a/internal/peer/chaincode/common.go b/internal/peer/chaincode/common.go
index 25c139dfb..b9c1660b0 100644
--- a/internal/peer/chaincode/common.go
+++ b/internal/peer/chaincode/common.go
@@ -29,7 +29,7 @@ import (
 	"github.com/hyperledger/fabric/protoutil"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 // checkSpec to see if chaincode resides within current package capture for language.
diff --git a/internal/peer/chaincode/common_test.go b/internal/peer/chaincode/common_test.go
index 24d7addd8..9bf93a1e7 100644
--- a/internal/peer/chaincode/common_test.go
+++ b/internal/peer/chaincode/common_test.go
@@ -32,7 +32,7 @@ import (
 	"github.com/hyperledger/fabric/protoutil"
 	. "github.com/onsi/gomega"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/internal/peer/chaincode/flags_test.go b/internal/peer/chaincode/flags_test.go
index a74ad4f41..46858eff9 100644
--- a/internal/peer/chaincode/flags_test.go
+++ b/internal/peer/chaincode/flags_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hyperledger/fabric/bccsp/sw"
 	"github.com/hyperledger/fabric/internal/peer/common"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/peer/chaincode/install_test.go b/internal/peer/chaincode/install_test.go
index 874041490..3e7049a0e 100644
--- a/internal/peer/chaincode/install_test.go
+++ b/internal/peer/chaincode/install_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/hyperledger/fabric/bccsp/sw"
 	"github.com/hyperledger/fabric/internal/peer/common"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/peer/chaincode/invoke_test.go b/internal/peer/chaincode/invoke_test.go
index c7b5b2006..71bc6ec09 100644
--- a/internal/peer/chaincode/invoke_test.go
+++ b/internal/peer/chaincode/invoke_test.go
@@ -22,7 +22,7 @@ import (
 	"github.com/hyperledger/fabric/internal/peer/common"
 	"github.com/hyperledger/fabric/msp"
 	"github.com/hyperledger/fabric/protoutil"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc"
 )
diff --git a/internal/peer/chaincode/upgrade_test.go b/internal/peer/chaincode/upgrade_test.go
index 260b01fae..2dcf28d09 100644
--- a/internal/peer/chaincode/upgrade_test.go
+++ b/internal/peer/chaincode/upgrade_test.go
@@ -15,7 +15,7 @@ import (
 	pb "github.com/hyperledger/fabric-protos-go/peer"
 	"github.com/hyperledger/fabric/bccsp/sw"
 	"github.com/hyperledger/fabric/internal/peer/common"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/peer/channel/create_test.go b/internal/peer/channel/create_test.go
index 459ea609a..b2e5b84c8 100644
--- a/internal/peer/channel/create_test.go
+++ b/internal/peer/channel/create_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/hyperledger/fabric/internal/pkg/identity"
 	msptesttools "github.com/hyperledger/fabric/msp/mgmt/testtools"
 	"github.com/hyperledger/fabric/protoutil"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc"
 )
diff --git a/internal/peer/channel/fetch_test.go b/internal/peer/channel/fetch_test.go
index 8a38c0316..ea11ce972 100644
--- a/internal/peer/channel/fetch_test.go
+++ b/internal/peer/channel/fetch_test.go
@@ -20,7 +20,7 @@ import (
 	"github.com/hyperledger/fabric/internal/peer/common"
 	"github.com/hyperledger/fabric/internal/peer/common/mock"
 	"github.com/hyperledger/fabric/protoutil"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/peer/channel/flags_test.go b/internal/peer/channel/flags_test.go
index c393dd293..8a14db5d1 100644
--- a/internal/peer/channel/flags_test.go
+++ b/internal/peer/channel/flags_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/hyperledger/fabric/internal/peer/common"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/peer/channel/join_test.go b/internal/peer/channel/join_test.go
index 61681cd04..610b7387a 100644
--- a/internal/peer/channel/join_test.go
+++ b/internal/peer/channel/join_test.go
@@ -15,7 +15,7 @@ import (
 
 	pb "github.com/hyperledger/fabric-protos-go/peer"
 	"github.com/hyperledger/fabric/internal/peer/common"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/peer/common/common.go b/internal/peer/common/common.go
index 6f598d8f1..1c4567603 100644
--- a/internal/peer/common/common.go
+++ b/internal/peer/common/common.go
@@ -30,7 +30,7 @@ import (
 	"github.com/mitchellh/mapstructure"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 // UndefinedParamValue defines what undefined parameters in the command line will initialise to
diff --git a/internal/peer/common/common_test.go b/internal/peer/common/common_test.go
index 9d0325cc4..8397dee4f 100644
--- a/internal/peer/common/common_test.go
+++ b/internal/peer/common/common_test.go
@@ -17,7 +17,7 @@ import (
 	"github.com/hyperledger/fabric/core/config/configtest"
 	"github.com/hyperledger/fabric/internal/peer/common"
 	"github.com/hyperledger/fabric/msp"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/peer/common/deliverclient_test.go b/internal/peer/common/deliverclient_test.go
index 76425014a..d46eb738b 100644
--- a/internal/peer/common/deliverclient_test.go
+++ b/internal/peer/common/deliverclient_test.go
@@ -19,7 +19,7 @@ import (
 	"github.com/hyperledger/fabric/internal/pkg/identity"
 	msptesttools "github.com/hyperledger/fabric/msp/mgmt/testtools"
 	"github.com/hyperledger/fabric/protoutil"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/peer/common/ordererclient_test.go b/internal/peer/common/ordererclient_test.go
index acd5c0ab0..6c28f1816 100644
--- a/internal/peer/common/ordererclient_test.go
+++ b/internal/peer/common/ordererclient_test.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/hyperledger/fabric/core/comm"
 	"github.com/hyperledger/fabric/internal/peer/common"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/peer/common/ordererenv.go b/internal/peer/common/ordererenv.go
index e15f7b949..66dadf097 100644
--- a/internal/peer/common/ordererenv.go
+++ b/internal/peer/common/ordererenv.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 var (
diff --git a/internal/peer/common/ordererenv_test.go b/internal/peer/common/ordererenv_test.go
index 934dad791..643a8d8b2 100644
--- a/internal/peer/common/ordererenv_test.go
+++ b/internal/peer/common/ordererenv_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/hyperledger/fabric/internal/peer/common"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/peer/common/peerclient.go b/internal/peer/common/peerclient.go
index 3abd136c0..288c21b0a 100644
--- a/internal/peer/common/peerclient.go
+++ b/internal/peer/common/peerclient.go
@@ -16,7 +16,7 @@ import (
 	"github.com/hyperledger/fabric/core/comm"
 	"github.com/hyperledger/fabric/core/config"
 	"github.com/pkg/errors"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 // PeerClient represents a client for communicating with a peer
diff --git a/internal/peer/common/peerclient_test.go b/internal/peer/common/peerclient_test.go
index b92040608..40045cb4a 100644
--- a/internal/peer/common/peerclient_test.go
+++ b/internal/peer/common/peerclient_test.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/hyperledger/fabric/core/comm"
 	"github.com/hyperledger/fabric/internal/peer/common"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/peer/lifecycle/chaincode/approveformyorg.go b/internal/peer/lifecycle/chaincode/approveformyorg.go
index 3e42f98ca..a23ae735a 100644
--- a/internal/peer/lifecycle/chaincode/approveformyorg.go
+++ b/internal/peer/lifecycle/chaincode/approveformyorg.go
@@ -22,7 +22,7 @@ import (
 	"github.com/hyperledger/fabric/protoutil"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 // ApproverForMyOrg holds the dependencies needed to approve
diff --git a/internal/peer/lifecycle/chaincode/checkcommitreadiness.go b/internal/peer/lifecycle/chaincode/checkcommitreadiness.go
index 1279a4bc2..d80dc568e 100644
--- a/internal/peer/lifecycle/chaincode/checkcommitreadiness.go
+++ b/internal/peer/lifecycle/chaincode/checkcommitreadiness.go
@@ -23,7 +23,7 @@ import (
 	"github.com/hyperledger/fabric/protoutil"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 // CommitReadinessChecker holds the dependencies needed to
diff --git a/internal/peer/lifecycle/chaincode/client_connections.go b/internal/peer/lifecycle/chaincode/client_connections.go
index 1b572f70e..398768649 100644
--- a/internal/peer/lifecycle/chaincode/client_connections.go
+++ b/internal/peer/lifecycle/chaincode/client_connections.go
@@ -14,7 +14,7 @@ import (
 	"github.com/hyperledger/fabric/internal/peer/common"
 	"github.com/hyperledger/fabric/internal/pkg/identity"
 	"github.com/pkg/errors"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 // ClientConnections holds the clients for connecting to the various
diff --git a/internal/peer/lifecycle/chaincode/commit.go b/internal/peer/lifecycle/chaincode/commit.go
index 1e9c41092..6da9eb65a 100644
--- a/internal/peer/lifecycle/chaincode/commit.go
+++ b/internal/peer/lifecycle/chaincode/commit.go
@@ -22,7 +22,7 @@ import (
 	"github.com/hyperledger/fabric/protoutil"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 // Committer holds the dependencies needed to commit
diff --git a/internal/peer/lifecycle/chaincode/getinstalledpackage.go b/internal/peer/lifecycle/chaincode/getinstalledpackage.go
index 1fee99138..e104c9435 100644
--- a/internal/peer/lifecycle/chaincode/getinstalledpackage.go
+++ b/internal/peer/lifecycle/chaincode/getinstalledpackage.go
@@ -19,7 +19,7 @@ import (
 	"github.com/hyperledger/fabric/protoutil"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 // InstalledPackageGetter holds the dependencies needed to retrieve
diff --git a/internal/peer/lifecycle/chaincode/install.go b/internal/peer/lifecycle/chaincode/install.go
index f0cf556e8..2a8f466e0 100644
--- a/internal/peer/lifecycle/chaincode/install.go
+++ b/internal/peer/lifecycle/chaincode/install.go
@@ -18,7 +18,7 @@ import (
 	"github.com/hyperledger/fabric/protoutil"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 // Reader defines the interface needed for reading a file.
diff --git a/internal/peer/lifecycle/chaincode/querycommitted.go b/internal/peer/lifecycle/chaincode/querycommitted.go
index ea98446cf..d35396872 100644
--- a/internal/peer/lifecycle/chaincode/querycommitted.go
+++ b/internal/peer/lifecycle/chaincode/querycommitted.go
@@ -22,7 +22,7 @@ import (
 	"github.com/hyperledger/fabric/protoutil"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 // CommittedQuerier holds the dependencies needed to query
diff --git a/internal/peer/lifecycle/chaincode/queryinstalled.go b/internal/peer/lifecycle/chaincode/queryinstalled.go
index 606edd7d3..14f369364 100644
--- a/internal/peer/lifecycle/chaincode/queryinstalled.go
+++ b/internal/peer/lifecycle/chaincode/queryinstalled.go
@@ -21,7 +21,7 @@ import (
 	"github.com/hyperledger/fabric/protoutil"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 // InstalledQuerier holds the dependencies needed to query
diff --git a/internal/peer/node/config.go b/internal/peer/node/config.go
index 753dc91e5..a302fc954 100644
--- a/internal/peer/node/config.go
+++ b/internal/peer/node/config.go
@@ -12,7 +12,7 @@ import (
 	coreconfig "github.com/hyperledger/fabric/core/config"
 	"github.com/hyperledger/fabric/core/ledger"
 	"github.com/hyperledger/fabric/core/ledger/util/couchdb"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 func ledgerConfig() *ledger.Config {
diff --git a/internal/peer/node/config_test.go b/internal/peer/node/config_test.go
index ecd54c7ea..2530b3ef5 100644
--- a/internal/peer/node/config_test.go
+++ b/internal/peer/node/config_test.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/hyperledger/fabric/core/ledger"
 	"github.com/hyperledger/fabric/core/ledger/util/couchdb"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/peer/node/pause_test.go b/internal/peer/node/pause_test.go
index de3400791..90af3e08b 100644
--- a/internal/peer/node/pause_test.go
+++ b/internal/peer/node/pause_test.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/internal/peer/node/rebuild_dbs_test.go b/internal/peer/node/rebuild_dbs_test.go
index 9060f0fb6..412ab73ab 100644
--- a/internal/peer/node/rebuild_dbs_test.go
+++ b/internal/peer/node/rebuild_dbs_test.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/hyperledger/fabric/core/config"
 	"github.com/hyperledger/fabric/core/ledger/kvledger"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/peer/node/reset_test.go b/internal/peer/node/reset_test.go
index 901bcc6d4..9f0a5acd6 100644
--- a/internal/peer/node/reset_test.go
+++ b/internal/peer/node/reset_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 
 	"github.com/hyperledger/fabric/core/config"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/peer/node/resume_test.go b/internal/peer/node/resume_test.go
index 9237b3a08..cd2faa7ad 100644
--- a/internal/peer/node/resume_test.go
+++ b/internal/peer/node/resume_test.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/internal/peer/node/start.go b/internal/peer/node/start.go
index c8587828f..6763778cd 100644
--- a/internal/peer/node/start.go
+++ b/internal/peer/node/start.go
@@ -96,7 +96,7 @@ import (
 	"github.com/hyperledger/fabric/protoutil"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"google.golang.org/grpc"
 )
 
diff --git a/internal/peer/node/start_test.go b/internal/peer/node/start_test.go
index 37f0e1f26..f83b2b14e 100644
--- a/internal/peer/node/start_test.go
+++ b/internal/peer/node/start_test.go
@@ -22,7 +22,7 @@ import (
 	msptesttools "github.com/hyperledger/fabric/msp/mgmt/testtools"
 	"github.com/mitchellh/mapstructure"
 	. "github.com/onsi/gomega"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc"
 )
diff --git a/internal/peer/node/upgrade_dbs_test.go b/internal/peer/node/upgrade_dbs_test.go
index 6b16c2a21..a378cb8e9 100644
--- a/internal/peer/node/upgrade_dbs_test.go
+++ b/internal/peer/node/upgrade_dbs_test.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/hyperledger/fabric/core/config"
 	"github.com/hyperledger/fabric/core/ledger/kvledger"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/msp/mgmt/mgmt.go b/msp/mgmt/mgmt.go
index d8418002e..8f9e21de2 100644
--- a/msp/mgmt/mgmt.go
+++ b/msp/mgmt/mgmt.go
@@ -16,7 +16,7 @@ import (
 	"github.com/hyperledger/fabric/msp"
 	"github.com/hyperledger/fabric/msp/cache"
 	"github.com/pkg/errors"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 // LoadLocalMspWithType loads the local MSP with the specified type from the specified directory
diff --git a/orderer/common/localconfig/config.go b/orderer/common/localconfig/config.go
index 350f9a188..e312dd8f8 100644
--- a/orderer/common/localconfig/config.go
+++ b/orderer/common/localconfig/config.go
@@ -14,7 +14,7 @@ import (
 	"github.com/hyperledger/fabric/common/flogging"
 	"github.com/hyperledger/fabric/common/viperutil"
 	coreconfig "github.com/hyperledger/fabric/core/config"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 )
 
 // Prefix for environment variables.
diff --git a/peer/node/common_test.go b/peer/node/common_test.go
index 5e6793ec6..dd80eafc9 100644
--- a/peer/node/common_test.go
+++ b/peer/node/common_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/hyperledger/fabric/common/flogging"
 	"github.com/hyperledger/fabric/core/config/configtest"
 	"github.com/hyperledger/fabric/internal/peer/common"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/peer/node/main_test.go b/peer/node/main_test.go
index 40481542d..0cada562a 100644
--- a/peer/node/main_test.go
+++ b/peer/node/main_test.go
@@ -13,7 +13,7 @@ import (
 
 	xtestutil "github.com/hyperledger/fabric/extensions/testutil"
 	msptesttools "github.com/hyperledger/fabric/msp/mgmt/testtools"
-	"github.com/spf13/viper"
+	viper "github.com/spf13/viper2015"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"