Context

!5659 (merged) is required in protocol Kathmandu. Cherry-picked all commits from it using the following commands.

$ git checkout -b proto-k-backport-5659
$ git cherry-pick 2809688e48f342a741b6d273e87ef3b3829699e4^..b6ecce4870c128f8bfda244cc1a4d44e0eac155e

Resolved conflict in docs/protocols/alpha.rst.

Manually testing the MR

Check CI.