Context

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

$ git checkout -b proto-k-backport-5702
$ git cherry-pick 2c3778eddf4a3d14621ffdce95397a40e3475775^..a91f65578a37053b0deccdff36d358c432bbec23

Manually testing the MR

Check CI.