Context

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

$ git checkout -b proto-k-backport-5703
$ git cherry-pick 1fc28920c7fecec59893ee9e2227e38202d36067^..f243bbc1ba1030e03d06fd69a4678f901f498dd8

Manually testing the MR

Check CI.