Context

Manually testing the MR

Check the CI
git cherry-pick 6dda43fe1443a29cd8016a00b418ce500f6561de^..49500ae9a0321edfbd26ee811f4a768671beb149

Document the interface of any function added or modified (see the coding guidelines)
Document any change to the user interface, including configuration parameters (see node configuration)
Provide automatic testing (see the testing guide).
For new features and bug fixes, add an item in the appropriate changelog (docs/protocols/alpha.rst for the protocol and the environment, CHANGES.rst at the root of the repository for everything else).
Select suitable reviewers using the Reviewers field below.
Select as Assignee the next person who should take action on that MR