[stable2409] Backport #5311 (#6805)

Backport #5311 into `stable2409` from Doordashcon.

See the
[documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md)
on how to use this bot.

<!--
  # To be used by other automation, do not modify:
  original-pr-number: #${pull_number}
-->

Co-authored-by: Doordashcon <jesse.chejieh@gmail.com>