Context

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

$ git checkout -b proto-k-backport-5664
$ git cherry-pick c87c29f9c5728a0908047091517643f822bf11bd^..35d606f98a39549079ea1d1c11d344ebd2db42c2

Manually testing the MR

Check CI.