[stable2412] Backport #6505 (#6888)

Backport #6505 into `stable2412` from seadanda.

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: Dónal Murray <[email protected]>