[stable2503] Backport #7843 (#7969)

Backport #7843 into `stable2503` from raymondkfcheung.

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: Raymond Cheung <178801527+raymondkfcheung@users.noreply.github.com>