diff --git a/CHANGELOG.md b/CHANGELOG.md
index e78791c6cb9..3aad95956dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,382 @@
+## "v2.1.0"
+
+* [6cfea8b](https://github.com/hyperledger/fabric/commit/6cfea8b) Add release notes for v2.1.0
+* [4fbbc88](https://github.com/hyperledger/fabric/commit/4fbbc88) [FAB-17719](https://jira.hyperledger.org/browse/FAB-17719) Upgrade docs for 2.1
+* [d50e8f4](https://github.com/hyperledger/fabric/commit/d50e8f4) [FAB-17724](https://jira.hyperledger.org/browse/FAB-17724) Fix configtxgen cannot find etcdraft default config
+* [c2e8534](https://github.com/hyperledger/fabric/commit/c2e8534) [FAB-17716](https://jira.hyperledger.org/browse/FAB-17716) Fix test flake due to too many requests for /protos.Deliver
+* [5358d6e](https://github.com/hyperledger/fabric/commit/5358d6e) Properly handle malformed gossip envelopes (#1039)
+* [0602969](https://github.com/hyperledger/fabric/commit/0602969) [FAB-17540](https://jira.hyperledger.org/browse/FAB-17540) Fix for race read/write tlsconfig (#967) (#1052)
+* [10ed627](https://github.com/hyperledger/fabric/commit/10ed627) Add release note for [FAB-17725](https://jira.hyperledger.org/browse/FAB-17725)
+* [08df2e1](https://github.com/hyperledger/fabric/commit/08df2e1) Omit go.{mod,sum} from pkg when not in module mode
+* [d0d4a3f](https://github.com/hyperledger/fabric/commit/d0d4a3f) Clear {U,G}name fields in package tar entries
+* [53eda41](https://github.com/hyperledger/fabric/commit/53eda41) Fix typo
+* [6334d22](https://github.com/hyperledger/fabric/commit/6334d22) Fix organizations typo
+* [0f23dad](https://github.com/hyperledger/fabric/commit/0f23dad) [FAB-16879](https://jira.hyperledger.org/browse/FAB-16879) Add stack trace to couchdb http errors (#1015)
+* [6f4b196](https://github.com/hyperledger/fabric/commit/6f4b196) Update chaincode lifecycle topic
+* [2f13c6c](https://github.com/hyperledger/fabric/commit/2f13c6c) Update tutorials overview for test network
+* [32533a8](https://github.com/hyperledger/fabric/commit/32533a8) 3 small fixes that documentation matches samples
+* [a28ef41](https://github.com/hyperledger/fabric/commit/a28ef41) Set default keepalive options for peer clients (#987)
+* [c740f39](https://github.com/hyperledger/fabric/commit/c740f39) Update doc for Go v1.14.1
+* [99d3a8d](https://github.com/hyperledger/fabric/commit/99d3a8d) Remove Config Transaction Package from release-2.1
+* [30e5862](https://github.com/hyperledger/fabric/commit/30e5862) Fix missing export instruction in docs/deploy_chaincode.md
+* [534ed60](https://github.com/hyperledger/fabric/commit/534ed60) Move comm pkg to internal
+* [7919e72](https://github.com/hyperledger/fabric/commit/7919e72) [FAB-17109](https://jira.hyperledger.org/browse/FAB-17109) Retrieve and use ReConnectBackoffThreshold as duration (#951)
+* [f293f92](https://github.com/hyperledger/fabric/commit/f293f92) mv encoding util to consumer (pvtdatastorage)
+* [25e3386](https://github.com/hyperledger/fabric/commit/25e3386) Fix code block typo in add org tutorial
+* [20dca4d](https://github.com/hyperledger/fabric/commit/20dca4d) Clarify instructions for CouchDB state database upgrade.
+* [8704abf](https://github.com/hyperledger/fabric/commit/8704abf) Add discussion of MSP folder to test net doc
+* [5148730](https://github.com/hyperledger/fabric/commit/5148730) [FAB-17687](https://jira.hyperledger.org/browse/FAB-17687) Rename AddValue() to SetValue() (#946)
+* [0491bcd](https://github.com/hyperledger/fabric/commit/0491bcd) Refactor MSP-related pkg/config functions
+* [4d7d4ac](https://github.com/hyperledger/fabric/commit/4d7d4ac) [FAB-17638](https://jira.hyperledger.org/browse/FAB-17638) Support retrieving application configuration from an existing config
+* [84e2338](https://github.com/hyperledger/fabric/commit/84e2338) [FAB-17658](https://jira.hyperledger.org/browse/FAB-17658) Separate config package examples into groups
+* [eb4623f](https://github.com/hyperledger/fabric/commit/eb4623f) [FAB-17408](https://jira.hyperledger.org/browse/FAB-17408) Move first app tutorial (fabcar) to test network
+* [1cdd885](https://github.com/hyperledger/fabric/commit/1cdd885) Update commercial_paper.md
+* [cce54ab](https://github.com/hyperledger/fabric/commit/cce54ab) [FAB-17664](https://jira.hyperledger.org/browse/FAB-17664) Add/Remove channel policies
+* [424807d](https://github.com/hyperledger/fabric/commit/424807d) Add jq to the vagrant development environment
+* [8ab138e](https://github.com/hyperledger/fabric/commit/8ab138e) Address comments from #928
+* [b8e2e83](https://github.com/hyperledger/fabric/commit/b8e2e83) [FAB-17611](https://jira.hyperledger.org/browse/FAB-17611) IT: discover all peers before endorsement
+* [8a012a0](https://github.com/hyperledger/fabric/commit/8a012a0) Consistently use ubuntu-18.04
+* [fa29042](https://github.com/hyperledger/fabric/commit/fa29042) Move to go 1.14.1 (#934)
+* [69da72e](https://github.com/hyperledger/fabric/commit/69da72e) Remove x509 Utility
+* [4db1939](https://github.com/hyperledger/fabric/commit/4db1939) Remove Clone Utility
+* [1a3dab1](https://github.com/hyperledger/fabric/commit/1a3dab1) Remove DirMissingOrEmpty Util Function
+* [d7c1796](https://github.com/hyperledger/fabric/commit/d7c1796) [FAB-17663](https://jira.hyperledger.org/browse/FAB-17663) Update a consortium group's channel creation policy value
+* [23ebd79](https://github.com/hyperledger/fabric/commit/23ebd79) Update grpc to v1.28.0
+* [e06bb3f](https://github.com/hyperledger/fabric/commit/e06bb3f) [FAB-17675](https://jira.hyperledger.org/browse/FAB-17675) Prevent gossip probe from registering as a connection (#925)
+* [b5be754](https://github.com/hyperledger/fabric/commit/b5be754) [FAB-17637](https://jira.hyperledger.org/browse/FAB-17637) Support adding and removing capability
+* [222f99a](https://github.com/hyperledger/fabric/commit/222f99a) [FAB-17639](https://jira.hyperledger.org/browse/FAB-17639) Add/Remove ACLs from channel config.
+* [4d515e0](https://github.com/hyperledger/fabric/commit/4d515e0) [FAB-17619](https://jira.hyperledger.org/browse/FAB-17619) Fix exported ConfigTx functions to retrieve/set correct field
+* [79fb075](https://github.com/hyperledger/fabric/commit/79fb075) [FAB-17619](https://jira.hyperledger.org/browse/FAB-17619) encapsulate config proto in new type
+* [441fd13](https://github.com/hyperledger/fabric/commit/441fd13) [FAB-17650](https://jira.hyperledger.org/browse/FAB-17650) fix incorrect word
+* [edd5908](https://github.com/hyperledger/fabric/commit/edd5908) Update MSP config for application org
+* [cdc2f68](https://github.com/hyperledger/fabric/commit/cdc2f68) Cleanup followup comments from [FAB-17568](https://jira.hyperledger.org/browse/FAB-17568)
+* [4b9302e](https://github.com/hyperledger/fabric/commit/4b9302e) Ignore containers that are not part of the network (#909)
+* [aa80495](https://github.com/hyperledger/fabric/commit/aa80495) Update sample channel config to 2.0 channel (#911)
+* [8c26dad](https://github.com/hyperledger/fabric/commit/8c26dad) [FAB-17621](https://jira.hyperledger.org/browse/FAB-17621) Validate certificate when revoking
+* [6f7c37f](https://github.com/hyperledger/fabric/commit/6f7c37f) [FAB-17621](https://jira.hyperledger.org/browse/FAB-17621) Simplify Printf formatting of cert/key/crl in tests
+* [d547002](https://github.com/hyperledger/fabric/commit/d547002) Add link to Fabric chaincode lifecycle video
+* [7a85e0a](https://github.com/hyperledger/fabric/commit/7a85e0a) Remove duplicate tests done with both legacy cc and new lifecycle cc
+* [9644d43](https://github.com/hyperledger/fabric/commit/9644d43) [FAB-17601](https://jira.hyperledger.org/browse/FAB-17601) Fix CI flake due to unexpected pvtdata reconciliation
+* [a4b2ab1](https://github.com/hyperledger/fabric/commit/a4b2ab1) [FAB-17620](https://jira.hyperledger.org/browse/FAB-17620) Address error handling in example_test
+* [e914648](https://github.com/hyperledger/fabric/commit/e914648) Fix master
+* [9468dbb](https://github.com/hyperledger/fabric/commit/9468dbb) Generate all certs and CRLs in pkg/config unit tests
+* [67cb2df](https://github.com/hyperledger/fabric/commit/67cb2df) AddOrgToConsortium shouldn't allow adding org that already exists
+* [0e178b4](https://github.com/hyperledger/fabric/commit/0e178b4) [FAB-17574](https://jira.hyperledger.org/browse/FAB-17574) Support adding an application org to a channel config
+* [25b268e](https://github.com/hyperledger/fabric/commit/25b268e) [FAB-17620](https://jira.hyperledger.org/browse/FAB-17620) Revisit reference types in config pkg
+* [7af853e](https://github.com/hyperledger/fabric/commit/7af853e) [FAB-17568](https://jira.hyperledger.org/browse/FAB-17568) Support retrieving orderer configuration from a channel transaction
+* [dacf97a](https://github.com/hyperledger/fabric/commit/dacf97a) [FAB-17636](https://jira.hyperledger.org/browse/FAB-17636) Support retrieving capabilities from a channel transaction
+* [40cda0e](https://github.com/hyperledger/fabric/commit/40cda0e) [FAB-17568](https://jira.hyperledger.org/browse/FAB-17568) Use custom API type for etcdraft ConfigMetadata proto
+* [f092efc](https://github.com/hyperledger/fabric/commit/f092efc) Change link in access control for policies
+* [b03d600](https://github.com/hyperledger/fabric/commit/b03d600) [FAB-17592](https://jira.hyperledger.org/browse/FAB-17592) Support removing an orderer endpoint from existing config
+* [eb17803](https://github.com/hyperledger/fabric/commit/eb17803) Fix nits in function AddOrdererEndpoint
+* [66b9722](https://github.com/hyperledger/fabric/commit/66b9722) Remove unused function validateChannelHeaderType (#890)
+* [ac367be](https://github.com/hyperledger/fabric/commit/ac367be) Minor MSP-related cleanup
+* [1d92fca](https://github.com/hyperledger/fabric/commit/1d92fca) [FAB-17591](https://jira.hyperledger.org/browse/FAB-17591) Support adding an orderer endpoint to existing config
+* [ef436c9](https://github.com/hyperledger/fabric/commit/ef436c9) Revoke certificate from application org MSP
+* [e96618d](https://github.com/hyperledger/fabric/commit/e96618d) [FAB-17546](https://jira.hyperledger.org/browse/FAB-17546) Add rootCA to application org MSP
+* [a247e32](https://github.com/hyperledger/fabric/commit/a247e32) Cleanup policies test in config package
+* [f02f451](https://github.com/hyperledger/fabric/commit/f02f451) Reduce TestDBRequestTimeout timeout value (#885)
+* [76f999d](https://github.com/hyperledger/fabric/commit/76f999d) Fix debug message
+* [dfc600b](https://github.com/hyperledger/fabric/commit/dfc600b) Remove incorrect ref to SDK
+* [a838c6b](https://github.com/hyperledger/fabric/commit/a838c6b) Add configtx.yaml link to channel update doc
+* [64d6c66](https://github.com/hyperledger/fabric/commit/64d6c66) [FAB-17571](https://jira.hyperledger.org/browse/FAB-17571) Implement adding/removing policies from orderer
+* [984c3e2](https://github.com/hyperledger/fabric/commit/984c3e2) [FAB-17572](https://jira.hyperledger.org/browse/FAB-17572) Implement adding/removing policies from consortiums orgs
+* [507734c](https://github.com/hyperledger/fabric/commit/507734c) [FAB-17570](https://jira.hyperledger.org/browse/FAB-17570) Implement adding/removing policies from application
+* [b3929ae](https://github.com/hyperledger/fabric/commit/b3929ae) Use session cache to reduce handshake time in test
+* [9ffdb2b](https://github.com/hyperledger/fabric/commit/9ffdb2b) [FAB-17635](https://jira.hyperledger.org/browse/FAB-17635) Fix incorrect word in comment
+* [aa9a468](https://github.com/hyperledger/fabric/commit/aa9a468) grpc{logging,metrics} test flake updates
+* [69b5487](https://github.com/hyperledger/fabric/commit/69b5487) [FAB-17629](https://jira.hyperledger.org/browse/FAB-17629) Correctly Compile Integration Test List
+* [7feb8c5](https://github.com/hyperledger/fabric/commit/7feb8c5) [FAB-17603](https://jira.hyperledger.org/browse/FAB-17603) Add constants for consensus state
+* [12f5e39](https://github.com/hyperledger/fabric/commit/12f5e39) [FAB-17603](https://jira.hyperledger.org/browse/FAB-17603) Support consensus type state field in config value
+* [64bc161](https://github.com/hyperledger/fabric/commit/64bc161) [FAB-17569](https://jira.hyperledger.org/browse/FAB-17569) Retrieve organization from configGroup
+* [1df5929](https://github.com/hyperledger/fabric/commit/1df5929) Call signal.Notify from main go routine
+* [15b735d](https://github.com/hyperledger/fabric/commit/15b735d) Use WithOptions to register log hook in test
+* [c063206](https://github.com/hyperledger/fabric/commit/c063206) Stop excluding /vendor/ from conditional deps
+* [a30cb24](https://github.com/hyperledger/fabric/commit/a30cb24) Fix incorrect expression in comment
+* [d7c9a5b](https://github.com/hyperledger/fabric/commit/d7c9a5b) Bump assertion library dependencies (#871)
+* [a68440b](https://github.com/hyperledger/fabric/commit/a68440b) Use correct *testing.T in sub-tests (#867)
+* [c61a024](https://github.com/hyperledger/fabric/commit/c61a024) Fix LevelDB.Open failures in TestSpawnEtcdRaft (#869)
+* [e80709e](https://github.com/hyperledger/fabric/commit/e80709e) fix typo in comment (#860)
+* [c43f945](https://github.com/hyperledger/fabric/commit/c43f945) Bump zap dependency
+* [3617de2](https://github.com/hyperledger/fabric/commit/3617de2) [FAB-17623](https://jira.hyperledger.org/browse/FAB-17623) Replace OrdererAddressesKey with EndpointsKey in orderer org's Values
+* [3affbf0](https://github.com/hyperledger/fabric/commit/3affbf0) [FAB-17624](https://jira.hyperledger.org/browse/FAB-17624) Handle net.Listen error in gossip unit test (#863)
+* [30efdab](https://github.com/hyperledger/fabric/commit/30efdab) Fixed 2 typos (#861)
+* [af7980f](https://github.com/hyperledger/fabric/commit/af7980f) Fix data race at discovery (#859)
+* [481cf22](https://github.com/hyperledger/fabric/commit/481cf22) Discover CLI to support SEC 1 format private keys
+* [587a8d5](https://github.com/hyperledger/fabric/commit/587a8d5) [FAB-17576](https://jira.hyperledger.org/browse/FAB-17576) Cleanup MSP config retrieval logic
+* [084db84](https://github.com/hyperledger/fabric/commit/084db84) [FAB-17576](https://jira.hyperledger.org/browse/FAB-17576) Support retrieving MSP configuration for a specific org
+* [cc199be](https://github.com/hyperledger/fabric/commit/cc199be) [FAB-17613](https://jira.hyperledger.org/browse/FAB-17613) correcting misspelled words 1. Add consensus type ectdraft in orderer.yaml 2. Correcting misspelled words
+* [9c3172c](https://github.com/hyperledger/fabric/commit/9c3172c) Fix Test Flake in TestLedgerHeightFromProperties (#846)
+* [2794f98](https://github.com/hyperledger/fabric/commit/2794f98) [FAB-17573](https://jira.hyperledger.org/browse/FAB-17573) Support adding organization to orderer group
+* [81b6160](https://github.com/hyperledger/fabric/commit/81b6160) Fix data race in TestHaltChainProcessing
+* [c38e83d](https://github.com/hyperledger/fabric/commit/c38e83d) [FAB-17607](https://jira.hyperledger.org/browse/FAB-17607) Fix some wrong word
+* [2671855](https://github.com/hyperledger/fabric/commit/2671855) [FAB-17606](https://jira.hyperledger.org/browse/FAB-17606) Fix the wrong word. Suported ---> Supported
+* [db2e930](https://github.com/hyperledger/fabric/commit/db2e930) Fix data race in TestBlockingEnqueue (#850)
+* [ff29da2](https://github.com/hyperledger/fabric/commit/ff29da2) Fix data race in expiration UT (#847)
+* [88eff11](https://github.com/hyperledger/fabric/commit/88eff11) [FAB-17600](https://jira.hyperledger.org/browse/FAB-17600) Fixes retrieve policies for a specific config group
+* [9489a75](https://github.com/hyperledger/fabric/commit/9489a75) BCCSP initialization cleanup
+* [9abe9e7](https://github.com/hyperledger/fabric/commit/9abe9e7) [FAB-17600](https://jira.hyperledger.org/browse/FAB-17600) retrieve policies for a specific org
+* [e31fe5f](https://github.com/hyperledger/fabric/commit/e31fe5f) [FAB-17565](https://jira.hyperledger.org/browse/FAB-17565) Add godoc example for NewCreateChannelTx
+* [7438fc2](https://github.com/hyperledger/fabric/commit/7438fc2) [FAB-17552](https://jira.hyperledger.org/browse/FAB-17552) Add godoc example for updating channel using pkg/config
+* [ab2ecf0](https://github.com/hyperledger/fabric/commit/ab2ecf0) fix the comment error
+* [e07939f](https://github.com/hyperledger/fabric/commit/e07939f) [FAB-17581](https://jira.hyperledger.org/browse/FAB-17581) Increase gossip timeout to prevent test flake
+* [6582179](https://github.com/hyperledger/fabric/commit/6582179) Move common/ledger/util/Buffer to consumer
+* [00bd23c](https://github.com/hyperledger/fabric/commit/00bd23c) [FAB-17517](https://jira.hyperledger.org/browse/FAB-17517) Only Initialize specified provider
+* [6566d1b](https://github.com/hyperledger/fabric/commit/6566d1b) Update channel config in config integration
+* [b8617f0](https://github.com/hyperledger/fabric/commit/b8617f0) Avoid port conflicts in configtxlator tests (#826)
+* [554e10c](https://github.com/hyperledger/fabric/commit/554e10c) Remove shared common/ledger/blockledger/mocks (#829)
+* [845b5ed](https://github.com/hyperledger/fabric/commit/845b5ed) Convert unnecessary config type references to values
+* [7315556](https://github.com/hyperledger/fabric/commit/7315556) [FAB-17582](https://jira.hyperledger.org/browse/FAB-17582) Use custom API type for FabricMSPConfig proto
+* [f410279](https://github.com/hyperledger/fabric/commit/f410279) Add integration test package that uses pkg/config
+* [300fb0c](https://github.com/hyperledger/fabric/commit/300fb0c) Move lifecycle tutorial to concept topics
+* [b033c8d](https://github.com/hyperledger/fabric/commit/b033c8d) [FAB-17596](https://jira.hyperledger.org/browse/FAB-17596) Remove unused Resources type from config
+* [79f180f](https://github.com/hyperledger/fabric/commit/79f180f) [FAB-17561](https://jira.hyperledger.org/browse/FAB-17561) Remove SkipAsForeign from config package
+* [3beba71](https://github.com/hyperledger/fabric/commit/3beba71) [FAB-17567](https://jira.hyperledger.org/browse/FAB-17567) implement getAnchorPeers from application org (#812)
+* [304acfd](https://github.com/hyperledger/fabric/commit/304acfd) Misc updates to test network tutorial
+* [0f1ce6b](https://github.com/hyperledger/fabric/commit/0f1ce6b) [FAB-17269](https://jira.hyperledger.org/browse/FAB-17269) Create new deploy a Chaincode tutorial
+* [bd0d710](https://github.com/hyperledger/fabric/commit/bd0d710) Add deprecation notice to BYFN
+* [131c9e9](https://github.com/hyperledger/fabric/commit/131c9e9) [FAB-17299](https://jira.hyperledger.org/browse/FAB-17299) Support collection level endorsement policies for discovery support (#472)
+* [863433f](https://github.com/hyperledger/fabric/commit/863433f) Remove plugin_packages from run-unit-tests.sh
+* [136d361](https://github.com/hyperledger/fabric/commit/136d361) [FAB-15570](https://jira.hyperledger.org/browse/FAB-15570) Make peer functions synchronous
+* [f6732d1](https://github.com/hyperledger/fabric/commit/f6732d1) Use ephemeral port for TLSCA test
+* [044060c](https://github.com/hyperledger/fabric/commit/044060c) [FAB-17583](https://jira.hyperledger.org/browse/FAB-17583) Simplify NewCreateChannelTx to only consider new application channels
+* [ab56e81](https://github.com/hyperledger/fabric/commit/ab56e81) The operations subsystem is a singular entity
+* [a78e2da](https://github.com/hyperledger/fabric/commit/a78e2da) [FAB-17543](https://jira.hyperledger.org/browse/FAB-17543) Support adding anchor peers to existing config
+* [9304dd3](https://github.com/hyperledger/fabric/commit/9304dd3) Relax error assertion in health check test
+* [21fa648](https://github.com/hyperledger/fabric/commit/21fa648) fix typo in Anchor Peers
+* [a90767c](https://github.com/hyperledger/fabric/commit/a90767c) Update msp.rst (#691)
+* [789071c](https://github.com/hyperledger/fabric/commit/789071c) [FAB-17575](https://jira.hyperledger.org/browse/FAB-17575) Encapsulate msp configuration at an organization level
+* [fa59dda](https://github.com/hyperledger/fabric/commit/fa59dda) [FAB-17547](https://jira.hyperledger.org/browse/FAB-17547) fix cache load configuration file unittest
+* [56fbcf5](https://github.com/hyperledger/fabric/commit/56fbcf5) Bump version of golang.org/x/tools (#788)
+* [88e331b](https://github.com/hyperledger/fabric/commit/88e331b) Fix conflict in pkg/config test
+* [e054a8a](https://github.com/hyperledger/fabric/commit/e054a8a) [FAB-17529](https://jira.hyperledger.org/browse/FAB-17529) Config package exported function and types comment hygiene
+* [5a066a2](https://github.com/hyperledger/fabric/commit/5a066a2) [FAB-17535](https://jira.hyperledger.org/browse/FAB-17535) Increase PushAckTimeout to prevent test flake
+* [5f6ea7d](https://github.com/hyperledger/fabric/commit/5f6ea7d) Revert "[FAB-17575](https://jira.hyperledger.org/browse/FAB-17575) Encapsulate msp configuration at an organization level"
+* [1f72dc6](https://github.com/hyperledger/fabric/commit/1f72dc6) [FAB-17547](https://jira.hyperledger.org/browse/FAB-17547) cache result of load configuration file
+* [e8b882a](https://github.com/hyperledger/fabric/commit/e8b882a) [FAB-17575](https://jira.hyperledger.org/browse/FAB-17575) Encapsulate msp configuration at an organization level
+* [4e68e59](https://github.com/hyperledger/fabric/commit/4e68e59) [FAB-17535](https://jira.hyperledger.org/browse/FAB-17535) Fix intermittent test failure in implicit_coll_test
+* [4afde7c](https://github.com/hyperledger/fabric/commit/4afde7c) [FAB-17544](https://jira.hyperledger.org/browse/FAB-17544) Support removing anchor peers from an existing config (#765)
+* [ce8e015](https://github.com/hyperledger/fabric/commit/ce8e015) Wire disabled docker builder when docker disabled (#768)
+* [3c19833](https://github.com/hyperledger/fabric/commit/3c19833) Fixed typo word 'netwowrk' in test_network.md
+* [9e59e94](https://github.com/hyperledger/fabric/commit/9e59e94) Try to catch imports of gogo/proto during linting (#762)
+* [a362c28](https://github.com/hyperledger/fabric/commit/a362c28) Cleanup Makefile - remove unused env vars
+* [b4b2a95](https://github.com/hyperledger/fabric/commit/b4b2a95) Mailing list correction to Still Have Questions? document
+* [b78d79b](https://github.com/hyperledger/fabric/commit/b78d79b) Fix duplicate AddOrgToConsortium
+* [8c1a290](https://github.com/hyperledger/fabric/commit/8c1a290) [FAB-17510](https://jira.hyperledger.org/browse/FAB-17510) Change AddOrgToConsortium() to modify the provided config
+* [9cf1196](https://github.com/hyperledger/fabric/commit/9cf1196) [FAB-17529](https://jira.hyperledger.org/browse/FAB-17529) More config package cleanup
+* [3d89ccf](https://github.com/hyperledger/fabric/commit/3d89ccf) [FAB-17463](https://jira.hyperledger.org/browse/FAB-17463) Allow peer to override implicit collection dissemination properties
+* [f086a3c](https://github.com/hyperledger/fabric/commit/f086a3c) Revert "[FAB-17438](https://jira.hyperledger.org/browse/FAB-17438) CA deployment guide (#751)"
+* [e8673de](https://github.com/hyperledger/fabric/commit/e8673de) Prepare for go 1.14 (#755)
+* [7ed2fe3](https://github.com/hyperledger/fabric/commit/7ed2fe3) Replace gogo proto imports with golang proto (#757)
+* [a3fb26a](https://github.com/hyperledger/fabric/commit/a3fb26a) Add Public() to SigningIdentity
+* [592bd50](https://github.com/hyperledger/fabric/commit/592bd50) [FAB-16233](https://jira.hyperledger.org/browse/FAB-16233) Mitigate test timeout in deliver test
+* [04d3bf2](https://github.com/hyperledger/fabric/commit/04d3bf2) [FAB-17438](https://jira.hyperledger.org/browse/FAB-17438) CA deployment guide (#751)
+* [218b6b5](https://github.com/hyperledger/fabric/commit/218b6b5) cmd/peer tests fail due to port conflict
+* [2d6debc](https://github.com/hyperledger/fabric/commit/2d6debc) missing word 'you' in test_network.md
+* [5389a1d](https://github.com/hyperledger/fabric/commit/5389a1d) [FAB-17529](https://jira.hyperledger.org/browse/FAB-17529) general cleanups for config package
+* [6cdc08f](https://github.com/hyperledger/fabric/commit/6cdc08f) [FAB-17533](https://jira.hyperledger.org/browse/FAB-17533) Change config package to use policydsl's FromString and remove fork of policyparser
+* [6f80693](https://github.com/hyperledger/fabric/commit/6f80693) [FAB-17533](https://jira.hyperledger.org/browse/FAB-17533) Move policy dsl related logic to policydsl package
+* [d2f0729](https://github.com/hyperledger/fabric/commit/d2f0729) Signing-related cleanup in pkg/config
+* [a2c9244](https://github.com/hyperledger/fabric/commit/a2c9244) Remove proto compilation in contributing docs
+* [fd00849](https://github.com/hyperledger/fabric/commit/fd00849) Fix unit test failure related to merge conflict
+* [b4141f4](https://github.com/hyperledger/fabric/commit/b4141f4) Update master references for v1.4.6
+* [6343d0b](https://github.com/hyperledger/fabric/commit/6343d0b) [FAB-17529](https://jira.hyperledger.org/browse/FAB-17529) Reduce and clarify errors in pkg/config
+* [86c048e](https://github.com/hyperledger/fabric/commit/86c048e) Implement function to add an org to an existing consortium
+* [3e4f04c](https://github.com/hyperledger/fabric/commit/3e4f04c) [FAB-17469](https://jira.hyperledger.org/browse/FAB-17469) Support updating orderer configuration
+* [f032ff7](https://github.com/hyperledger/fabric/commit/f032ff7) [FAB-17532](https://jira.hyperledger.org/browse/FAB-17532): remove unused parameters (#734)
+* [ebe23a8](https://github.com/hyperledger/fabric/commit/ebe23a8) [FAB-17093](https://jira.hyperledger.org/browse/FAB-17093) Add basic tests for protoext/decorate_test
+* [dedc4e8](https://github.com/hyperledger/fabric/commit/dedc4e8) [FAB-17488](https://jira.hyperledger.org/browse/FAB-17488) Compute a ConfigUpdate from a base and modified configuration transaction
+* [deff589](https://github.com/hyperledger/fabric/commit/deff589) Reformat Deployment Overview for RST (#723)
+* [ebb529f](https://github.com/hyperledger/fabric/commit/ebb529f) [FAB-17530](https://jira.hyperledger.org/browse/FAB-17530) Update Go Version to 1.13.8
+* [8161192](https://github.com/hyperledger/fabric/commit/8161192) [FAB-17521](https://jira.hyperledger.org/browse/FAB-17521) remove protoutil from policyparser tests.
+* [046253c](https://github.com/hyperledger/fabric/commit/046253c) Fix nil dereference in etcdraft config parsing
+* [627719d](https://github.com/hyperledger/fabric/commit/627719d) [FAB-17468](https://jira.hyperledger.org/browse/FAB-17468) Attach signatures to config update
+* [0c1821d](https://github.com/hyperledger/fabric/commit/0c1821d) [FAB-17515](https://jira.hyperledger.org/browse/FAB-17515) Support configuring BlockValidation policy for orderer group
+* [437d8ec](https://github.com/hyperledger/fabric/commit/437d8ec) [FAB-17487](https://jira.hyperledger.org/browse/FAB-17487) Create config group for organization
+* [cc3f58f](https://github.com/hyperledger/fabric/commit/cc3f58f) [FAB-16957](https://jira.hyperledger.org/browse/FAB-16957) Fix nil pointer panic flake in deliver_test (#704)
+* [b4c3766](https://github.com/hyperledger/fabric/commit/b4c3766) Add cURL with retry logic
+* [b7a3eba](https://github.com/hyperledger/fabric/commit/b7a3eba) [FAB-17523](https://jira.hyperledger.org/browse/FAB-17523) Endorsing peer was not honoring RequiredPeerCount (#716)
+* [8aa64fa](https://github.com/hyperledger/fabric/commit/8aa64fa) [FAB-17467](https://jira.hyperledger.org/browse/FAB-17467) Create signature for config update
+* [add77fa](https://github.com/hyperledger/fabric/commit/add77fa) [FAB-17525](https://jira.hyperledger.org/browse/FAB-17525) Fix peer panic for endorser metric labels (#721)
+* [eb54d86](https://github.com/hyperledger/fabric/commit/eb54d86) Add ending braces to ReadWrite set. (#722)
+* [447264e](https://github.com/hyperledger/fabric/commit/447264e) [FAB-17524](https://jira.hyperledger.org/browse/FAB-17524) rm custom CollectionAccessPolicy mock
+* [f8a1a0b](https://github.com/hyperledger/fabric/commit/f8a1a0b) Optimize inquire.IsSubset (#710)
+* [9649b26](https://github.com/hyperledger/fabric/commit/9649b26) Fix Heading Size in Deployment Doc
+* [43f7474](https://github.com/hyperledger/fabric/commit/43f7474) [FAB-11240](https://jira.hyperledger.org/browse/FAB-11240) Deployment guide doc (#554)
+* [8c37495](https://github.com/hyperledger/fabric/commit/8c37495) Update master references for v1.4.5
+* [eeaeea9](https://github.com/hyperledger/fabric/commit/eeaeea9) Fix build error due to PR merging (#703)
+* [6dfec3c](https://github.com/hyperledger/fabric/commit/6dfec3c) [FAB-19491](https://jira.hyperledger.org/browse/FAB-19491) Do not disseminate pvtdata for other org's implicit collection
+* [9eaab49](https://github.com/hyperledger/fabric/commit/9eaab49) [FAB-17466](https://jira.hyperledger.org/browse/FAB-17466) Generate create channel transaction
+* [9f26222](https://github.com/hyperledger/fabric/commit/9f26222) [FAB-16297](https://jira.hyperledger.org/browse/FAB-16297) remove pvtdataStore initiation with non-zero blkHt (#701)
+* [43ff898](https://github.com/hyperledger/fabric/commit/43ff898) [FAB-17509](https://jira.hyperledger.org/browse/FAB-17509) Handle all os.Stat errors in InitCrypto (#683)
+* [8dd5e2d](https://github.com/hyperledger/fabric/commit/8dd5e2d) [FAB-17059](https://jira.hyperledger.org/browse/FAB-17059) Extend private data integration tests to cover case when a new eligible peer with different certs joins the channel and attempts to fetch private data before processing the config update that adds its certs to the channel config
+* [b52075b](https://github.com/hyperledger/fabric/commit/b52075b) [FAB-17059](https://jira.hyperledger.org/browse/FAB-17059) Change collection membership eligibility checks to only compare mspID instead of Evaluating the certificate against the access policy
+* [a6b8132](https://github.com/hyperledger/fabric/commit/a6b8132) Remove qscc concurrency limit
+* [bee7154](https://github.com/hyperledger/fabric/commit/bee7154) [FAB-17453](https://jira.hyperledger.org/browse/FAB-17453) 'peer lifecycle chaincode package' mandates does not need to init crypto
+* [8c095b7](https://github.com/hyperledger/fabric/commit/8c095b7) Reduce execution time of platforms/golang tests (#680)
+* [81d5e62](https://github.com/hyperledger/fabric/commit/81d5e62) [FAB-17472](https://jira.hyperledger.org/browse/FAB-17472) Clarify doc and samples for NodeOU Certificate
+* [b1d3c3c](https://github.com/hyperledger/fabric/commit/b1d3c3c) Remove redundant tests from core/cc package (#679)
+* [1f2ba16](https://github.com/hyperledger/fabric/commit/1f2ba16) Remove dead and irrelevant Jenkins references
+* [8080690](https://github.com/hyperledger/fabric/commit/8080690) Limit concurrent requests to endorser/deliver services (#647)
+* [21724c4](https://github.com/hyperledger/fabric/commit/21724c4) [FAB-17462](https://jira.hyperledger.org/browse/FAB-17462) Create signature for config update
+* [98b2b70](https://github.com/hyperledger/fabric/commit/98b2b70) Remove unused code
+* [870264c](https://github.com/hyperledger/fabric/commit/870264c) Miscellaneous updates to doc
+* [f4eed90](https://github.com/hyperledger/fabric/commit/f4eed90) Add fabric-peer docker image readme
+* [e5152fc](https://github.com/hyperledger/fabric/commit/e5152fc) Fix URLs that don't exist in ledger doc
+* [73ff25c](https://github.com/hyperledger/fabric/commit/73ff25c) [FAB-17479](https://jira.hyperledger.org/browse/FAB-17479) Migrated Kafka cluster can be safely expanded later (#644)
+* [7d4e8f1](https://github.com/hyperledger/fabric/commit/7d4e8f1) Fix fixed-width rendering in metrics doc
+* [ff5e2da](https://github.com/hyperledger/fabric/commit/ff5e2da) [FAB-14679](https://jira.hyperledger.org/browse/FAB-14679) Update commercial paper tutorial for new chaincode lifecycle
+* [3ddda88](https://github.com/hyperledger/fabric/commit/3ddda88) Update link to Fabric research paper
+* [2f45180](https://github.com/hyperledger/fabric/commit/2f45180) Add link to policies topic to chaincode for operators (#659)
+* [54117fb](https://github.com/hyperledger/fabric/commit/54117fb) Update Copyright for 2020
+* [7134abf](https://github.com/hyperledger/fabric/commit/7134abf) [FAB-17492](https://jira.hyperledger.org/browse/FAB-17492) Modify the test function name of the function ConcatenateBytes
+* [cfee149](https://github.com/hyperledger/fabric/commit/cfee149) Explicitly enumerate orderer and peer metrics
+* [90ccd4b](https://github.com/hyperledger/fabric/commit/90ccd4b) Add style guide to contributing.rst
+* [76999ea](https://github.com/hyperledger/fabric/commit/76999ea) [FAB-16978](https://jira.hyperledger.org/browse/FAB-16978) MSP Updates
+* [1f8a6f0](https://github.com/hyperledger/fabric/commit/1f8a6f0) [FAB-17484](https://jira.hyperledger.org/browse/FAB-17484) Improve comments on maintenance filter
+* [e22010d](https://github.com/hyperledger/fabric/commit/e22010d) [FAB-17475](https://jira.hyperledger.org/browse/FAB-17475) Documentation style guide
+* [e498d32](https://github.com/hyperledger/fabric/commit/e498d32) fix typo
+* [8ccf64e](https://github.com/hyperledger/fabric/commit/8ccf64e) [FAB-17192](https://jira.hyperledger.org/browse/FAB-17192) Add unit tests for executeCommitter and commitUpdates (#621)
+* [34637b6](https://github.com/hyperledger/fabric/commit/34637b6) Minor simplification of ApproveChaincodeDefinition logic
+* [a672575](https://github.com/hyperledger/fabric/commit/a672575) Fix typo in package error message
+* [ce939ab](https://github.com/hyperledger/fabric/commit/ce939ab) Remove execute permissions on data files
+* [a68ff2a](https://github.com/hyperledger/fabric/commit/a68ff2a) Remove 1.x video from 2.0 docs
+* [78c4e58](https://github.com/hyperledger/fabric/commit/78c4e58) [FAB-17458](https://jira.hyperledger.org/browse/FAB-17458) check LifecycleV20 capability before getting cc info (#608)
+* [7907a99](https://github.com/hyperledger/fabric/commit/7907a99) [FAB-17441](https://jira.hyperledger.org/browse/FAB-17441) approveformyorg should allow update of only package ID (#560)
+* [0624345](https://github.com/hyperledger/fabric/commit/0624345) Remove manifest-tool from gotools
+* [7dca15f](https://github.com/hyperledger/fabric/commit/7dca15f) [FAB-17190](https://jira.hyperledger.org/browse/FAB-17190) Add unit test for statecouchdb buildCommittersForNs and buildCommitters (#567)
+* [5417f84](https://github.com/hyperledger/fabric/commit/5417f84) [FAB-17267](https://jira.hyperledger.org/browse/FAB-17267) Move add an org to a channel tutorial to test network
+* [5f3eb76](https://github.com/hyperledger/fabric/commit/5f3eb76) Remove Fabric functionalities doc
+* [5a8bff5](https://github.com/hyperledger/fabric/commit/5a8bff5) Fix missed merge conflicts
+* [ff14f61](https://github.com/hyperledger/fabric/commit/ff14f61) Policies topic link fix
+* [25707b9](https://github.com/hyperledger/fabric/commit/25707b9) Add dynamic variables to doc
+* [ea35c56](https://github.com/hyperledger/fabric/commit/ea35c56) Add support for placeholder replacement in doc builds
+* [1d2c73b](https://github.com/hyperledger/fabric/commit/1d2c73b) [FABCN-378] Update links to chaincode JSDoc
+* [140299e](https://github.com/hyperledger/fabric/commit/140299e) Remove link for node SDK tutorial
+* [75feb85](https://github.com/hyperledger/fabric/commit/75feb85) Fix conditional_packages processing in UT script
+* [01b45dd](https://github.com/hyperledger/fabric/commit/01b45dd) Add Alpine version to tools Dockerfile
+* [2138c5f](https://github.com/hyperledger/fabric/commit/2138c5f) [FAB-17424](https://jira.hyperledger.org/browse/FAB-17424) Fix broken link in DevApps connection profile
+* [0d4691f](https://github.com/hyperledger/fabric/commit/0d4691f) [FAB-17448](https://jira.hyperledger.org/browse/FAB-17448) Fix couchDB startup inconsistence in package couchDB (#578)
+* [cb721dd](https://github.com/hyperledger/fabric/commit/cb721dd) Install doc and script updates for v2.0.0
+* [aae1636](https://github.com/hyperledger/fabric/commit/aae1636) [FAB-17381](https://jira.hyperledger.org/browse/FAB-17381) Update policy concept for test network
+* [2ec3b51](https://github.com/hyperledger/fabric/commit/2ec3b51) What's New updates for v2.0.0 release
+* [2aa12b1](https://github.com/hyperledger/fabric/commit/2aa12b1) Bump hyperledger/fabric-amcl (#585)
+* [ec5374f](https://github.com/hyperledger/fabric/commit/ec5374f) Add Core Maintainers to /docs in CODEOWNERS
+* [d03f87a](https://github.com/hyperledger/fabric/commit/d03f87a) [FAB-17439](https://jira.hyperledger.org/browse/FAB-17439) Add integration test for verifying fabric-chaincode-go shim API function GetMSPID()
+* [679985f](https://github.com/hyperledger/fabric/commit/679985f) Revert "FAB-14693 Vendor updated fabric-amcl package"
+* [5138d25](https://github.com/hyperledger/fabric/commit/5138d25) [FAB-17421](https://jira.hyperledger.org/browse/FAB-17421) Reword links to contract APIs and documentation
+* [ad84e47](https://github.com/hyperledger/fabric/commit/ad84e47) [FAB-17443](https://jira.hyperledger.org/browse/FAB-17443) Implement Bot to Support Doc Maintainers
+* [c842b27](https://github.com/hyperledger/fabric/commit/c842b27) [FAB-17357](https://jira.hyperledger.org/browse/FAB-17357) Add endorser metric for simulation failure (#572)
+* [1804f10](https://github.com/hyperledger/fabric/commit/1804f10) Validate label when packaging _lifecycle chaincode
+* [07903f6](https://github.com/hyperledger/fabric/commit/07903f6) Enable service discovery querying _lifecycle endorsers (#544)
+* [dfcd610](https://github.com/hyperledger/fabric/commit/dfcd610) Create a new Documentation Maintainers sub-group
+* [3708d0c](https://github.com/hyperledger/fabric/commit/3708d0c) [FAB-17442](https://jira.hyperledger.org/browse/FAB-17442) Fix comments on private collection layout in lifecycle.go
+* [a4de31d](https://github.com/hyperledger/fabric/commit/a4de31d) [FAB-17431](https://jira.hyperledger.org/browse/FAB-17431) Use two digit version for chaincode images
+* [de00702](https://github.com/hyperledger/fabric/commit/de00702) [FAB-17440](https://jira.hyperledger.org/browse/FAB-17440) Improve docs on peer lifecycle chaincode with JSON output
+* [b503fc9](https://github.com/hyperledger/fabric/commit/b503fc9) [FAB-17303](https://jira.hyperledger.org/browse/FAB-17303) Set RequiredPeerCount and MaxPeerCount defaults for implicit and explicit collections
+* [1a7802c](https://github.com/hyperledger/fabric/commit/1a7802c) Bump fabric-chaincode-go (#563)
+* [392ecda](https://github.com/hyperledger/fabric/commit/392ecda) [FAB-17439](https://jira.hyperledger.org/browse/FAB-17439) Expose peer's MSPID to chaincode as an env var (#549)
+* [789e6b0](https://github.com/hyperledger/fabric/commit/789e6b0) Revert back to slice of structs for ExternalBuilders
+* [3cab984](https://github.com/hyperledger/fabric/commit/3cab984) [FAB-17410](https://jira.hyperledger.org/browse/FAB-17410) Updated doc links to latest levels
+* [0d2f0e2](https://github.com/hyperledger/fabric/commit/0d2f0e2) Fix file license header.
+* [544e0c4](https://github.com/hyperledger/fabric/commit/544e0c4) [FAB-17189](https://jira.hyperledger.org/browse/FAB-17189) Add unit test for statecouchdb getRevisions. (#543)
+* [6f0fdb1](https://github.com/hyperledger/fabric/commit/6f0fdb1) Updating chaincode document.
+* [50d92bc](https://github.com/hyperledger/fabric/commit/50d92bc) fix wrong escaping in document (#551)
+* [978f463](https://github.com/hyperledger/fabric/commit/978f463) Stop _lifecycle ccs that are no longer referenced
+* [1673a73](https://github.com/hyperledger/fabric/commit/1673a73) No need to explicitly deregister handler from registry
+* [5e9b545](https://github.com/hyperledger/fabric/commit/5e9b545) Fail fast if 'jq' is missing (#539)
+* [0576e9a](https://github.com/hyperledger/fabric/commit/0576e9a) [FAB-17428](https://jira.hyperledger.org/browse/FAB-17428) Deprecate --outputAnchorPeersUpdate flag in configtxgen
+* [49620b1](https://github.com/hyperledger/fabric/commit/49620b1) [FAB-17308](https://jira.hyperledger.org/browse/FAB-17308) Discovery supports private data blind writes (#538)
+* [5c61999](https://github.com/hyperledger/fabric/commit/5c61999) [FAB-15920](https://jira.hyperledger.org/browse/FAB-15920) Fix peer not respond when couchDB building indexes (#527)
+* [0cc7a72](https://github.com/hyperledger/fabric/commit/0cc7a72) [FAB-16033](https://jira.hyperledger.org/browse/FAB-16033) Update channel_artifacts location in doc.
+* [813d21e](https://github.com/hyperledger/fabric/commit/813d21e) Improve chaincode lifecycle peer log messages
+* [5b292d3](https://github.com/hyperledger/fabric/commit/5b292d3) Update resources in enable _lifecycle doc
+* [2b1c072](https://github.com/hyperledger/fabric/commit/2b1c072) Update _lifecycle resources in configtx.yaml
+* [2b84d37](https://github.com/hyperledger/fabric/commit/2b84d37) Add disclaimer for commercial paper tutorial
+* [227c024](https://github.com/hyperledger/fabric/commit/227c024) Remove references to instantiating a chaincode
+* [fa4908a](https://github.com/hyperledger/fabric/commit/fa4908a) [FAB-17411](https://jira.hyperledger.org/browse/FAB-17411) Update Fabric versions where necessary
+* [8556a43](https://github.com/hyperledger/fabric/commit/8556a43) [FAB-17265](https://jira.hyperledger.org/browse/FAB-17265) Move private data tutorial to use test network
+* [1462df9](https://github.com/hyperledger/fabric/commit/1462df9) [FAB-16895](https://jira.hyperledger.org/browse/FAB-16895) Move ledger benchmark tests
+* [22a0d2c](https://github.com/hyperledger/fabric/commit/22a0d2c) Documentation update: external chaincode and index for db
+* [b6a2325](https://github.com/hyperledger/fabric/commit/b6a2325) Documentation update: external chaincode and index for db
+* [04e5312](https://github.com/hyperledger/fabric/commit/04e5312) Documentation update: external chaincode and index for db
+* [fc16896](https://github.com/hyperledger/fabric/commit/fc16896) Documentation update: external chaincode and index for db
+* [03d8a85](https://github.com/hyperledger/fabric/commit/03d8a85) [FAB-17400](https://jira.hyperledger.org/browse/FAB-17400) Improve log message for approved definition
+* [ca35d68](https://github.com/hyperledger/fabric/commit/ca35d68) [FAB-17402](https://jira.hyperledger.org/browse/FAB-17402) Test network doc user feedback fix
+* [9c6021d](https://github.com/hyperledger/fabric/commit/9c6021d) Add orderer.yaml BootstrapFile usage and default comments (#514)
+* [3b8224e](https://github.com/hyperledger/fabric/commit/3b8224e) Remove reference to First Network in network concept doc
+* [11358a4](https://github.com/hyperledger/fabric/commit/11358a4) [FAB-17287](https://jira.hyperledger.org/browse/FAB-17287): Update wallet description
+* [b1260cb](https://github.com/hyperledger/fabric/commit/b1260cb) Fix integration test for static leader (#513)
+* [c7d595a](https://github.com/hyperledger/fabric/commit/c7d595a) [FAB-17169](https://jira.hyperledger.org/browse/FAB-17169) Add AZP Status Badge (#510)
+* [470f133](https://github.com/hyperledger/fabric/commit/470f133) Static leader should not give up on retrieving blocks (#507)
+* [2d6becc](https://github.com/hyperledger/fabric/commit/2d6becc) [FAB-17266](https://jira.hyperledger.org/browse/FAB-17266) Move CouchDB tutorial to test network
+* [af66ef8](https://github.com/hyperledger/fabric/commit/af66ef8) [FAB-17379](https://jira.hyperledger.org/browse/FAB-17379) Fix print format for querycommitted
+* [3a66888](https://github.com/hyperledger/fabric/commit/3a66888) [FAB-15198](https://jira.hyperledger.org/browse/FAB-15198) Document peer crash scenario when indexes are not installed
+* [21fc6f6](https://github.com/hyperledger/fabric/commit/21fc6f6) [FAB-17339](https://jira.hyperledger.org/browse/FAB-17339) Refactor couchDB unit test (#482)
+* [c491d69](https://github.com/hyperledger/fabric/commit/c491d69) Fix go routine leak in core/scc tests (#502)
+* [8aab447](https://github.com/hyperledger/fabric/commit/8aab447) Implement stop for runtime launcher
+* [b578a96](https://github.com/hyperledger/fabric/commit/b578a96) Chaincode persistence uses period separator (#492)
+* [143d2e9](https://github.com/hyperledger/fabric/commit/143d2e9) lifecycle cache should remove stale cc def references
+* [0bd45e5](https://github.com/hyperledger/fabric/commit/0bd45e5) [FAB-17173](https://jira.hyperledger.org/browse/FAB-17173) Document that CouchDB indexes may not get applied in crash scenarios
+* [73303a5](https://github.com/hyperledger/fabric/commit/73303a5) Remove BYFN reference from private data architecture doc
+* [7d56fac](https://github.com/hyperledger/fabric/commit/7d56fac) [FAB-4955](https://jira.hyperledger.org/browse/FAB-4955) Update doc for building on Windows
+* [0df1557](https://github.com/hyperledger/fabric/commit/0df1557) [FAB-17315](https://jira.hyperledger.org/browse/FAB-17315) english colon illegal filename problem on windows when lifecycle chaincode install Signed-off-by: kevinxiong <59443487@qq.com>
+* [d0d935a](https://github.com/hyperledger/fabric/commit/d0d935a) Log message should start with upper case.
+* [58af762](https://github.com/hyperledger/fabric/commit/58af762) Reject re-defining identical uncommitted cc def
+* [ac9f694](https://github.com/hyperledger/fabric/commit/ac9f694) Bump hyperledger/fabric-chaincode-go
+* [803434a](https://github.com/hyperledger/fabric/commit/803434a) Bump hyperledger/fabric-protos-go
+* [dcdd599](https://github.com/hyperledger/fabric/commit/dcdd599) [FAB-17370](https://jira.hyperledger.org/browse/FAB-17370) Delete old info about shim’s Logger (#489)
+* [8318470](https://github.com/hyperledger/fabric/commit/8318470) Reduce the number of peers in test networks
+* [d80c5f5](https://github.com/hyperledger/fabric/commit/d80c5f5) Fixing Number in Chaincode for Operators topic
+* [f101cab](https://github.com/hyperledger/fabric/commit/f101cab) Remove t.Parallel from common/cluster tests
+* [83dacb4](https://github.com/hyperledger/fabric/commit/83dacb4) Fix and chaincode label regexp and Backfill tests
+* [4549cfb](https://github.com/hyperledger/fabric/commit/4549cfb) Ensure we capture final line of chaincode output
+* [5d2cb8f](https://github.com/hyperledger/fabric/commit/5d2cb8f) Add channel name to blockpuller logger
+* [02f85b4](https://github.com/hyperledger/fabric/commit/02f85b4) [FAB-17317](https://jira.hyperledger.org/browse/FAB-17317) Add code to stop init_public container
+* [69ecb07](https://github.com/hyperledger/fabric/commit/69ecb07) [FAB-17307](https://jira.hyperledger.org/browse/FAB-17307) InitRequired param check for ApproveForMyorg (#462)
+* [04c1f85](https://github.com/hyperledger/fabric/commit/04c1f85) Fix CODEOWNERS group name
+* [f1c6d88](https://github.com/hyperledger/fabric/commit/f1c6d88) Small edits to upgrade docs
+* [80febba](https://github.com/hyperledger/fabric/commit/80febba) Fix Broken link in cc as a service doc
+* [9b25eab](https://github.com/hyperledger/fabric/commit/9b25eab) [FAB-13625](https://jira.hyperledger.org/browse/FAB-13625) Add memberOnlyWrite integration test
+* [2f80112](https://github.com/hyperledger/fabric/commit/2f80112) make correction of the docker-compose command in build_network.rst In file docs/source/build_network.rst, one of docker-compose command has extra option "up".
+* [6ac19e5](https://github.com/hyperledger/fabric/commit/6ac19e5) Range query UT for keys with special or non-English characters
+* [e4f00b9](https://github.com/hyperledger/fabric/commit/e4f00b9) Cleanup packaging utilities chaincode/platforms
+* [42606a5](https://github.com/hyperledger/fabric/commit/42606a5) Use `go list -json` to build go cc dependencies
+* [571842f](https://github.com/hyperledger/fabric/commit/571842f) Wait for orderer to terminate before restarting (#460)
+* [92af234](https://github.com/hyperledger/fabric/commit/92af234) [FAB-17263](https://jira.hyperledger.org/browse/FAB-17263) Update upgrade doc with peer docker command
+* [f26c2b4](https://github.com/hyperledger/fabric/commit/f26c2b4) [FAB-15817](https://jira.hyperledger.org/browse/FAB-15817) Prefer last config in signatures metadata field (#363)
+* [269cb04](https://github.com/hyperledger/fabric/commit/269cb04) external chaincode service doc update
+* [12a2fd3](https://github.com/hyperledger/fabric/commit/12a2fd3) Remove gerrit specific .gitreview
+* [9e59923](https://github.com/hyperledger/fabric/commit/9e59923) Remove CAP theorem information from first network tutorial
+* [bfc762b](https://github.com/hyperledger/fabric/commit/bfc762b) [FAB-17184](https://jira.hyperledger.org/browse/FAB-17184) Skip pulling from remote peers if all remaining missing rwsets (#365)
+* [ff7c083](https://github.com/hyperledger/fabric/commit/ff7c083) [FAB-17301](https://jira.hyperledger.org/browse/FAB-17301) Add documentation build instructions to contribution guide
+* [d35acaa](https://github.com/hyperledger/fabric/commit/d35acaa) [FAB-16120](https://jira.hyperledger.org/browse/FAB-16120) Adding IT for MSP inconsistence (#305)
+* [c939f45](https://github.com/hyperledger/fabric/commit/c939f45) Fabcar uses first-network instead basic-network
+* [2e2506d](https://github.com/hyperledger/fabric/commit/2e2506d) Point CODEOWNERS to group
+* [2dae4c0](https://github.com/hyperledger/fabric/commit/2dae4c0) Remove Gerrit reference (#453)
+* [d89b9a6](https://github.com/hyperledger/fabric/commit/d89b9a6) Test Network tutorial header fix (#452)
+* [c34eae3](https://github.com/hyperledger/fabric/commit/c34eae3) [FAB-17262](https://jira.hyperledger.org/browse/FAB-17262) Fix instructions in build_network
+* [2a39779](https://github.com/hyperledger/fabric/commit/2a39779) [FAB-17279](https://jira.hyperledger.org/browse/FAB-17279) Discovery supports collection level endorsement policies (#445)
+* [65f8a01](https://github.com/hyperledger/fabric/commit/65f8a01) [FAB-17297](https://jira.hyperledger.org/browse/FAB-17297) Use wget in bootstrap.sh
+* [74345be](https://github.com/hyperledger/fabric/commit/74345be) FABN-1428: Relocate Node SDK documentation
+* [f20eeb4](https://github.com/hyperledger/fabric/commit/f20eeb4) [FAB-17231](https://jira.hyperledger.org/browse/FAB-17231) Update externalBuilders description in sampleconfig (#443)
+* [c54b8c0](https://github.com/hyperledger/fabric/commit/c54b8c0) [DOC] Standardize orderer address env var
+* [9495e67](https://github.com/hyperledger/fabric/commit/9495e67) Remove CKA_PRIVATE from pubkeyT to broaden compatibility with HSMs
+* [0b5923b](https://github.com/hyperledger/fabric/commit/0b5923b) [FAB-17238](https://jira.hyperledger.org/browse/FAB-17238) Refactor couchdb test in ./core/ledger/
+* [de14789](https://github.com/hyperledger/fabric/commit/de14789) FGJ-67: Relocate Java SDK docs
+* [fa0f68c](https://github.com/hyperledger/fabric/commit/fa0f68c) Increase open file limit to address Gossip flakes (#430)
+* [ca905ee](https://github.com/hyperledger/fabric/commit/ca905ee) fix wrong protobuf import in mgr_test.go
+* [2fbd83d](https://github.com/hyperledger/fabric/commit/2fbd83d) [FAB-17176](https://jira.hyperledger.org/browse/FAB-17176) Make decode hooks consistent in viperutil (#424)
+* [28c6efd](https://github.com/hyperledger/fabric/commit/28c6efd) define couchDB connection pool size [FAB-17277](https://jira.hyperledger.org/browse/FAB-17277) fix too many TCP connections between peer and CouchDB
+* [c25924a](https://github.com/hyperledger/fabric/commit/c25924a) [DOC] Mention deprecatation of Kafka and Solo (#425)
+* [2902908](https://github.com/hyperledger/fabric/commit/2902908) [FAB-17272](https://jira.hyperledger.org/browse/FAB-17272) Fix Docker Build Context
+* [f0ef0b5](https://github.com/hyperledger/fabric/commit/f0ef0b5) [FAB-17228](https://jira.hyperledger.org/browse/FAB-17228) External cc clients/servers use consistent key/cert model (#407)
+* [b3ac630](https://github.com/hyperledger/fabric/commit/b3ac630) Fixing operations guide toc for new cclauncher materia
+* [c80d1c0](https://github.com/hyperledger/fabric/commit/c80d1c0) [FAB-17233](https://jira.hyperledger.org/browse/FAB-17233) Update chaincode package comment
+* [fcfe51a](https://github.com/hyperledger/fabric/commit/fcfe51a) [FAB-17248](https://jira.hyperledger.org/browse/FAB-17248) Prepare for fabric next rel (v2.0.0)
+* [21594ac](https://github.com/hyperledger/fabric/commit/21594ac) Getting started link fix
+* [977ed80](https://github.com/hyperledger/fabric/commit/977ed80) Fix bootstrap.sh
+
 ## "v2.0.0-beta"
 
 * [7cd1eda](https://github.com/hyperledger/fabric/commit/7cd1eda) Add release notes for v2.0.0-beta
diff --git a/README.md b/README.md
index 09e40e50698..c5050c7c512 100644
--- a/README.md
+++ b/README.md
@@ -24,49 +24,16 @@ open source architecture; Hyperledger Fabric is your starting point.
 
 ## Releases
 
-- [v2.0.0 - January 29, 2020](https://github.com/hyperledger/fabric/releases/tag/v2.0.0)
-- [v2.0.0-beta - December 12, 2019](https://github.com/hyperledger/fabric/releases/tag/v2.0.0-beta)
-- [v2.0.0-alpha - April 9, 2019](https://github.com/hyperledger/fabric/releases/tag/v2.0.0-alpha)
-- [v1.4.6 - February 25, 2020](https://github.com/hyperledger/fabric/releases/tag/v1.4.6)
-- [v1.4.5 - February 19, 2020](https://github.com/hyperledger/fabric/releases/tag/v1.4.5)
-- [v1.4.4 - November 14, 2019](https://github.com/hyperledger/fabric/releases/tag/v1.4.4)
-- [v1.4.3 - August 26, 2019](https://github.com/hyperledger/fabric/releases/tag/v1.4.3)
-- [v1.4.2 - July 17, 2019](https://github.com/hyperledger/fabric/releases/tag/v1.4.2)
-- [v1.4.1 - April 11, 2019](https://github.com/hyperledger/fabric/releases/tag/v1.4.1)
-- [v1.4.1-rc1 - March 29, 2019](https://github.com/hyperledger/fabric/releases/tag/v1.4.1-rc1)
-- [v1.4.0 - January 9, 2019](https://github.com/hyperledger/fabric/releases/tag/v1.4.0)
-- [v1.4.0-rc2 - December 20, 2018](https://github.com/hyperledger/fabric/releases/tag/v1.4.0-rc2)
-- [v1.4.0-rc1 - December 10, 2018](https://github.com/hyperledger/fabric/releases/tag/v1.4.0-rc1)
-- [v1.3.0 - October 10, 2018](https://github.com/hyperledger/fabric/releases/tag/v1.3.0)
-- [v1.3.0-rc1 - September 24, 2018](https://github.com/hyperledger/fabric/releases/tag/v1.3.0-rc1)
-- [v1.2.0 - July 3, 2018](https://github.com/hyperledger/fabric/releases/tag/v1.2.0)
-- [v1.2.0-rc1 - June 22, 2018](https://github.com/hyperledger/fabric/releases/tag/v1.2.0-rc1)
-- [v1.1.0 - March 15, 2018](https://github.com/hyperledger/fabric/releases/tag/v1.1.0)
-- [v1.1.0-rc1 - March 1, 2018](https://github.com/hyperledger/fabric/releases/tag/v1.1.0-rc1)
-- [v1.1.0-alpha - January 25, 2018](https://github.com/hyperledger/fabric/releases/tag/v1.1.0-alpha)
-- [v1.0.5 - December 6, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.0.5)
-- [v1.1.0-preview - November 1, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.1.0-preview)
-- [v1.0.4 - October 31, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.0.4)
-- [v1.0.3 - October 3, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.0.3)
-- [v1.0.2 - September 10, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.0.2)
-- [v1.0.1 - August 10, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.0.1)
-- [v1.0.0 - July 11, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.0.0)
-- [v1.0.0-rc1 - June 23, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.0.0-rc1)
-- [v1.0.0-beta - June 8, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.0.0-beta)
-- [v1.0.0-alpha2 - May 14, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.0.0-alpha2)
-- [v1.0.0-alpha - March 16, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.0.0-alpha)
-- [v0.6.1-preview - October 15, 2016](https://github.com/hyperledger/fabric/releases/tag/v0.6.0-preview)
-- [v0.6.0-preview - September 16, 2016](https://github.com/hyperledger/fabric/releases/tag/v0.6.0-preview)
-
-## Release Roadmap
-
-Please visit the [Hyperledger Fabric wiki](https://wiki.hyperledger.org/display/fabric/Hyperledger+Fabric+Roadmap) for our release roadmap. We plan on a quarterly release cadence following the v1.1.0 release, delivering on a scoped set of themes and select features. Unless specified otherwise, all releases will be upgradable from the prior minor release.
+Fabric releases and release notes can be found on the [GitHub releases page](https://github.com/hyperledger/fabric/releases).
+
+Please visit the [Hyperledger Fabric Jira dashboard](https://jira.hyperledger.org/secure/Dashboard.jspa?selectPageId=10104) for our release roadmap. We plan on a quarterly release cadence, delivering on a scoped set of themes and select features. Unless specified otherwise, all releases will be upgradable from the prior minor release.
 
 ## Documentation, Getting Started and Developer Guides
 
 Please visit our
 online documentation for
 information on getting started using and developing with the fabric, SDK and chaincode:
+- [v2.1](http://hyperledger-fabric.readthedocs.io/en/release-2.1/)
 - [v2.0](http://hyperledger-fabric.readthedocs.io/en/release-2.0/)
 - [v1.4](http://hyperledger-fabric.readthedocs.io/en/release-1.4/)
 - [v1.3](http://hyperledger-fabric.readthedocs.io/en/release-1.3/)
diff --git a/docs/source/install.rst b/docs/source/install.rst
index aa7f9f4c917..10cbb8c9bee 100644
--- a/docs/source/install.rst
+++ b/docs/source/install.rst
@@ -49,12 +49,12 @@ the binaries and images.
 .. note:: If you want a specific release, pass a version identifier for Fabric,
           Fabric-ca and thirdparty Docker images.
           The command below demonstrates how to download the latest production releases -
-          **Fabric v2.0.0** and **Fabric CA v1.4.4**
+          **Fabric v2.1.0** and **Fabric CA v1.4.6**
 
 .. code:: bash
 
   curl -sSL https://bit.ly/2ysbOFE | bash -s -- <fabric_version> <fabric-ca_version> <thirdparty_version>
-  curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.0.0 1.4.4 0.4.18
+  curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.1.0 1.4.6 0.4.18
 
 .. note:: If you get an error running the above curl command, you may
           have too old a version of curl that does not handle
diff --git a/docs/source/whatsnew.rst b/docs/source/whatsnew.rst
index e4e77d3ff34..368b49c9975 100644
--- a/docs/source/whatsnew.rst
+++ b/docs/source/whatsnew.rst
@@ -1,4 +1,4 @@
-What's new in Hyperledger Fabric v2.0
+What's new in Hyperledger Fabric v2.x
 =====================================
 
 The first Hyperledger Fabric major release since v1.0, Fabric v2.0
@@ -6,9 +6,8 @@ delivers important new features and changes for users and operators alike,
 including support for new application and privacy patterns, enhanced
 governance around smart contracts, and new options for operating nodes.
 
-What has stayed the same is the ability to upgrade network components on
-your own terms, with support for rolling upgrades from v1.4.x, and the ability
-to enable the new capabilities only when member organizations are ready.
+Each v2.x minor release builds on the v2.0 release with minor features,
+improvements, and bug fixes.
 
 Let's take a look at some of the highlights of the Fabric v2.0 release...
 
@@ -194,11 +193,11 @@ in addition to cryptogen.
 
 For more information about this network, check out :doc:`test_network`.
 
-Upgrading to Fabric v2.0
+Upgrading to Fabric v2.x
 ------------------------
 
 A major new release brings some additional upgrade considerations. Rest assured
-though, that rolling upgrades from v1.4.x to v2.0 are supported, so that network
+though, that rolling upgrades from v1.4.x to v2.x are supported, so that network
 components can be upgraded one at a time with no downtime.
 
 The upgrade docs have been significantly expanded and reworked, and now have a
@@ -211,9 +210,11 @@ Release notes
 
 The release notes provide more details for users moving to the new release.
 Specifically, take a look at the changes and deprecations that are being
-announced with the new Fabric v2.0 release.
+announced with the new Fabric v2.0 release, and the changes introduced in v2.1.
 
 * `Fabric v2.0.0 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.0.0>`_.
+* `Fabric v2.0.1 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.0.1>`_.
+* `Fabric v2.1.0 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.1.0>`_.
 
 .. Licensed under Creative Commons Attribution 4.0 International License
    https://creativecommons.org/licenses/by/4.0/
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 018612b1efa..15b33b96b07 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -6,7 +6,7 @@
 #
 
 # if version not passed in, default to latest released version
-VERSION=2.0.0
+VERSION=2.1.0
 # if ca version not passed in, default to latest released version
 CA_VERSION=1.4.6
 # current version of thirdparty images (couchdb, kafka and zookeeper) released
@@ -23,8 +23,8 @@ printHelp() {
     echo "-s : bypass fabric-samples repo clone"
     echo "-b : bypass download of platform-specific binaries"
     echo
-    echo "e.g. bootstrap.sh 2.0.0 1.4.6 0.4.18 -s"
-    echo "would download docker images and binaries for Fabric v2.0.0 and Fabric CA v1.4.6"
+    echo "e.g. bootstrap.sh 2.1.0 1.4.6 0.4.18 -s"
+    echo "would download docker images and binaries for Fabric v2.1.0 and Fabric CA v1.4.6"
 }
 
 # dockerPull() pulls docker images from fabric and chaincode repositories