diff --git a/Agoric.md b/Agoric.md
new file mode 100644
index 0000000000..5be8686560
--- /dev/null
+++ b/Agoric.md
@@ -0,0 +1,5 @@
+# Agoric README
+
+This fork's primary development branch is `Agoric`. 
+
+Tags are of the form `<upstream-tag>-alpha.agoric.<N>` to make a series of revisions `<N>` on a given `<upstream-tag>`. As we go on, `alpha` might be replaced by `beta`, `stable`, `gold`, etc.
diff --git a/CHANGELOG-Agoric.md b/CHANGELOG-Agoric.md
new file mode 100644
index 0000000000..368bfcda3a
--- /dev/null
+++ b/CHANGELOG-Agoric.md
@@ -0,0 +1,54 @@
+<!--
+Guiding Principles:
+
+Changelogs are for humans, not machines.
+There should be an entry for every single version.
+The same types of changes should be grouped.
+Versions and sections should be linkable.
+The latest version comes first.
+The release date of each version is displayed.
+Mention whether you follow Semantic Versioning.
+
+Usage:
+
+Change log entries are to be added to the Unreleased section under the
+appropriate stanza (see below). Each entry should ideally include a tag and
+the Github issue reference in the following format:
+
+* (<tag>) \#<issue-number> message
+
+The issue numbers will later be link-ified during the release process so you do
+not have to worry about including a link manually, but you can if you wish.
+
+Types of changes (Stanzas):
+
+"Features" for new features.
+"Improvements" for changes in existing functionality.
+"Deprecated" for soon-to-be removed features.
+"Bug Fixes" for any bug fixes.
+"Client Breaking" for breaking CLI commands and REST routes.
+"State Machine Breaking" for breaking the AppState
+
+Ref: https://keepachangelog.com/en/1.0.0/
+-->
+
+# Changelog
+
+## [Unreleased]
+
+## [v0.34.23-alpha.agoric.2]
+
+* Agoric/agoric-sdk\#6945 Cherrypick fix for informalsystems/tendermint#4.
+
+## [v0.34.23-alpha.agoric.1]
+
+* Agoric/agoric-sdk\#6305 Merge `tendermint/tendermint` v0.34.23
+
+## [v0.34.21-alpha.agoric.1]
+
+* Agoric/agoric-sdk\#6305 Merge `tendermint/tendermint` v0.34.21.
+
+## [v0.34.14-alpha.agoric.1]
+
+* Merge `tendermint/tendermint` v0.34.23.
+* Add committing client for greater query concurrency.
diff --git a/abci/client/committing_client.go b/abci/client/committing_client.go
index 0dae7ecdb5..54706310d0 100644
--- a/abci/client/committing_client.go
+++ b/abci/client/committing_client.go
@@ -12,6 +12,8 @@ var _ Client = (*committingClient)(nil)
 // case of malicious tx or query). It only makes sense for publicly exposed
 // methods like CheckTx (/broadcast_tx_* RPC endpoint) or Query (/abci_query
 // RPC endpoint), but defers are used everywhere for the sake of consistency.
+//
+// NOTE: Keep in sync with changes to local_client.
 type committingClient struct {
 	service.BaseService
 
@@ -383,5 +385,7 @@ func (app *committingClient) ApplySnapshotChunkSync(
 func (app *committingClient) callback(req *types.Request, res *types.Response) *ReqRes {
 	// Never blocked
 	app.Callback(req, res)
-	return newLocalReqRes(req, res)
+	rr := newLocalReqRes(req, res)
+	rr.callbackInvoked = true
+	return rr
 }