[stable2407] Backport #6662 (#6801)

Backport #6662 into `stable2407` from eskimor.

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: eskimor <[email protected]>
Co-authored-by: Andrei Sandu <[email protected]>