Context

This is based on !6996 (merged) which is the backport of !6159 (merged).

This backport of !6871 (merged) is a prerequisite for the backport of !6803 (merged) (see description of !6159 (merged) for more details and testing instructions).

Manually testing the MR

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