Context

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

$ git checkout -b proto-k-backport-5715
$ git cherry-pick 41c511e39ce5c88160361ecea46af0dfa1f58672^..5999932901959a15d3ec5f0b5e9b3d4d3381bd37

Manually testing the MR

Check CI.