[stable2409] Backport #6855 (#7089)

Backport #6855 into `stable2409` from alistair-singh.

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: Alistair Singh <alistair.singh7@gmail.com>
Co-authored-by: Adrian Catangiu <adrian@parity.io>