diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00f3548d90da..7bace8e0a9bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,14 +38,15 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
 
-## [v0.50.5](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.5) - 2024-XX-XX
+## [v0.50.5](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.5) - 2024-03-12
 
 ### Features
 
-* (baseapp) [#19626](https://github.com/cosmos/cosmos-sdk/pull/19626) Adds `DisableBlockGasMeter` option to `BaseApp`, which removes the block gas meter during transaction execution.
+* (baseapp) [#19626](https://github.com/cosmos/cosmos-sdk/pull/19626) Add `DisableBlockGasMeter` option to `BaseApp`, which removes the block gas meter during transaction execution.
 
 ### Improvements
 
+* (x/distribution) [#19707](https://github.com/cosmos/cosmos-sdk/pull/19707) Add autocli config for `DelegationTotalRewards` for CLI consistency with `q rewards` commands in previous versions.
 * (x/auth) [#19651](https://github.com/cosmos/cosmos-sdk/pull/19651) Allow empty public keys in `GetSignBytesAdapter`.
 
 ### Bug Fixes
@@ -54,6 +55,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (types) [#19709](https://github.com/cosmos/cosmos-sdk/pull/19709) Fix skip staking genesis export when using `CoreAppModuleAdaptor` / `CoreAppModuleBasicAdaptor` for it.
 * (x/auth) [#19549](https://github.com/cosmos/cosmos-sdk/pull/19549) Accept custom get signers when injecting `x/auth/tx`.
 * (x/staking) Fix a possible bypass of delegator slashing: [GHSA-86h5-xcpx-cfqc](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-86h5-xcpx-cfqc)
+* (baseapp) Fix a bug in `baseapp.ValidateVoteExtensions` helper ([GHSA-95rx-m9m5-m94v](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-95rx-m9m5-m94v)). The helper has been fixed and for avoiding API breaking changes `currentHeight` and `chainID` arguments are ignored. Those arguments are removed from the helper in v0.51+.
 
 ## [v0.50.4](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.4) - 2024-02-19
 
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index e7b759f00774..0b0d46e5874a 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -4,17 +4,19 @@
 
 ## 🚀 Highlights
 
-While early in our monthly release cadence, this release includes a few notable fixes:
+This is time for another patch release of Cosmos SDK Eden.
+This release includes a few notable fixes:
 
-* Fix a bypass delagator slashing: [GHSA-86h5-xcpx-cfqc](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-86h5-xcpx-cfqc)
+* Fix a bypass delegator slashing: [GHSA-86h5-xcpx-cfqc](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-86h5-xcpx-cfqc)
+* Fix an issue in `baseapp.ValidateVoteExtensions` helper: [GHSA-95rx-m9m5-m94v](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-95rx-m9m5-m94v)
 * Allow to provide custom signers for `x/auth/tx` using depinject
 
 We recommended to upgrade to this patch release as soon as possible.  
-When upgrading from <= v0.50.3, please ensure that 2/3 of the validator power upgrade to v0.50.4.
+When upgrading from <= v0.50.4, please ensure that 2/3 of the validator power upgrade to v0.50.5.
 
 ## 📝 Changelog
 
 Check out the [changelog](https://github.com/cosmos/cosmos-sdk/blob/v0.50.5/CHANGELOG.md) for an exhaustive list of changes, or [compare changes](https://github.com/cosmos/cosmos-sdk/compare/release/v0.50.4...v0.50.5) from the last release.
 
 Refer to the [upgrading guide](https://github.com/cosmos/cosmos-sdk/blob/release/v0.50.x/UPGRADING.md) when migrating from `v0.47.x` to `v0.50.1`.
-Note, that the next SDK release, v0.51.0, will not include `x/params` migration, when migrating from < v0.47, v0.50.x **or** v0.47.x, is a mandatory migration.
+Note, that the next SDK release, v0.51, will not include `x/params` migration, when migrating from < v0.47, v0.50.x **or** v0.47.x, is a mandatory migration.
diff --git a/baseapp/abci_utils.go b/baseapp/abci_utils.go
index 4a8566823a9b..4cfadbbdca5a 100644
--- a/baseapp/abci_utils.go
+++ b/baseapp/abci_utils.go
@@ -39,6 +39,8 @@ type (
 // a proposer in PrepareProposal. It returns an error if any signature is invalid
 // or if unexpected vote extensions and/or signatures are found or less than 2/3
 // power is received.
+// NOTE: From v0.50.5 `currentHeight` and `chainID` arguments are ignored for fixing an issue.
+// They will be removed from the function in v0.51+.
 func ValidateVoteExtensions(
 	ctx sdk.Context,
 	valStore ValidatorStore,
diff --git a/baseapp/info.go b/baseapp/info.go
index 54f7f4745e39..1efb017b0579 100644
--- a/baseapp/info.go
+++ b/baseapp/info.go
@@ -8,14 +8,14 @@ import (
 	"cosmossdk.io/core/comet"
 )
 
-var _ comet.BlockInfo = (*cometInfo)(nil)
-
+// NewBlockInfo returns a new BlockInfo instance
+// This function should be only used in tests
 func NewBlockInfo(
 	misbehavior []abci.Misbehavior,
 	validatorsHash []byte,
 	proposerAddress []byte,
 	lastCommit abci.CommitInfo,
-) *cometInfo {
+) comet.BlockInfo {
 	return &cometInfo{
 		Misbehavior:     misbehavior,
 		ValidatorsHash:  validatorsHash,