diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e9571fd525e..4205a89a1b9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,29 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (deps) Downgrade to Tendermint [v0.34.20-rc0](https://github.com/tendermint/tendermint/releases/tag/v0.34.20-rc0).
 * [#12089](https://github.com/cosmos/cosmos-sdk/pull/12089) Mark the `TipDecorator` as beta, don't include it in simapp by default.
 * [#12153](https://github.com/cosmos/cosmos-sdk/pull/12153) Add a new `NewSimulationManagerFromAppModules` constructor, to simplify simulation wiring.
+<<<<<<< HEAD
+=======
+* [#12187](https://github.com/cosmos/cosmos-sdk/pull/12187) Add batch operation for x/nft module.
+* [#12453](https://github.com/cosmos/cosmos-sdk/pull/12453) Add `NewInMemoryWithKeyring` function which allows the creation of in memory `keystore` instances with a specified set of existing items.
+
+### State Machine Breaking
+
+* (x/slashing) [#12399](https://github.com/cosmos/cosmos-sdk/pull/12399) Migrate `x/slashing` to self-managed parameters and deprecate its usage of `x/params`.
+* (x/mint) [#12363](https://github.com/cosmos/cosmos-sdk/pull/12363) Migrate `x/mint` to self-managed parameters and deprecate it's usage of `x/params`.
+
+### API Breaking Changes
+
+* (x/gov) [#12368](https://github.com/cosmos/cosmos-sdk/pull/12369) Gov keeper is now passed by reference instead of copy to make post-construction mutation of Hooks and Proposal Handlers possible at a framework level.
+* (simapp) [#12270](https://github.com/cosmos/cosmos-sdk/pull/12270) Remove `invCheckPeriod uint` attribute from `SimApp` struct as per migration of `x/crisis` to app wiring
+* (simapp) [#12334](https://github.com/cosmos/cosmos-sdk/pull/12334) Move `simapp.ConvertAddrsToValAddrs` and `simapp.CreateTestPubKeys ` to respectively `simtestutil.ConvertAddrsToValAddrs` and `simtestutil.CreateTestPubKeys` (`testutil/sims`)
+* (simapp) [#12312](https://github.com/cosmos/cosmos-sdk/pull/12312) Move `simapp.EmptyAppOptions` to `simtestutil.EmptyAppOptions` (`testutil/sims`)
+* (simapp) [#12312](https://github.com/cosmos/cosmos-sdk/pull/12312) Remove `skipUpgradeHeights map[int64]bool` and `homePath string` from `NewSimApp` constructor as per migration of `x/upgrade` to app-wiring. 
+* (testutil) [#12278](https://github.com/cosmos/cosmos-sdk/pull/12278) Move all functions from `simapp/helpers` to `testutil/sims`
+* (testutil) [#12233](https://github.com/cosmos/cosmos-sdk/pull/12233) Move `simapp.TestAddr` to `simtestutil.TestAddr` (`testutil/sims`)
+* (x/staking) [#12102](https://github.com/cosmos/cosmos-sdk/pull/12102) Staking keeper now is passed by reference instead of copy. Keeper's SetHooks no longer returns keeper. It updates the keeper in place instead.
+* (linting) [#12141](https://github.com/cosmos/cosmos-sdk/pull/12141) Fix usability related linting for database.  This means removing the infix Prefix from `prefix.NewPrefixWriter` and such so that it is `prefix.NewWriter` and making `db.DBConnection` and such into `db.Connection`
+
+>>>>>>> 0bf30983f (feat: Support providing custom keyring for keystore. (#12453))
 
 ### Bug Fixes
 
diff --git a/crypto/keyring/keyring.go b/crypto/keyring/keyring.go
index 5434a27eed62..370e0111cec4 100644
--- a/crypto/keyring/keyring.go
+++ b/crypto/keyring/keyring.go
@@ -150,7 +150,13 @@ type Options struct {
 // purposes and on-the-fly key generation.
 // Keybase options can be applied when generating this new Keybase.
 func NewInMemory(cdc codec.Codec, opts ...Option) Keyring {
-	return newKeystore(keyring.NewArrayKeyring(nil), cdc, BackendMemory, opts...)
+	return NewInMemoryWithKeyring(keyring.NewArrayKeyring(nil), cdc, opts...)
+}
+
+// NewInMemoryWithKeyring returns an in memory keyring using the specified keyring.Keyring
+// as the backing keyring.
+func NewInMemoryWithKeyring(kr keyring.Keyring, cdc codec.Codec, opts ...Option) Keyring {
+	return newKeystore(kr, cdc, BackendMemory, opts...)
 }
 
 // New creates a new instance of a keyring.
diff --git a/crypto/keyring/keyring_test.go b/crypto/keyring/keyring_test.go
index 235a66d2687e..3d5fc132a121 100644
--- a/crypto/keyring/keyring_test.go
+++ b/crypto/keyring/keyring_test.go
@@ -21,6 +21,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto/keys/multisig"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	"github.com/cosmos/cosmos-sdk/crypto/types"
+	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -455,6 +456,49 @@ func TestInMemoryLanguage(t *testing.T) {
 	require.Equal(t, "unsupported language: only english is supported", err.Error())
 }
 
+func TestInMemoryWithKeyring(t *testing.T) {
+	priv := cryptotypes.PrivKey(secp256k1.GenPrivKey())
+	pub := priv.PubKey()
+
+	cdc := getCodec()
+	_, err := NewLocalRecord("test record", priv, pub)
+
+	multi := multisig.NewLegacyAminoPubKey(
+		1, []cryptotypes.PubKey{
+			pub,
+		},
+	)
+
+	appName := "test-app"
+
+	legacyMultiInfo, err := NewLegacyMultiInfo(appName, multi)
+	require.NoError(t, err)
+	serializedLegacyMultiInfo := MarshalInfo(legacyMultiInfo)
+
+	kb := NewInMemoryWithKeyring(keyring.NewArrayKeyring([]keyring.Item{
+		{
+			Key:         appName + ".info",
+			Data:        serializedLegacyMultiInfo,
+			Description: "test description",
+		},
+	}), cdc)
+
+	t.Run("key exists", func(t *testing.T) {
+		_, err := kb.Key(appName)
+		require.NoError(t, err)
+	})
+
+	t.Run("key deleted", func(t *testing.T) {
+		err := kb.Delete(appName)
+		require.NoError(t, err)
+
+		t.Run("key is gone", func(t *testing.T) {
+			_, err := kb.Key(appName)
+			require.Error(t, err)
+		})
+	})
+}
+
 func TestInMemoryCreateMultisig(t *testing.T) {
 	cdc := getCodec()
 	kb, err := New("keybasename", "memory", "", nil, cdc)