Context

!5751 (merged) is required in protocol Kathmandu. Cherry-picked commit from it using the following commands.

$ git checkout -b proto-k-backport-5751
$ git cherry-pick 5cd9067c2c8a52a9da18f398815e28c130936c84

Manually testing the MR

Check CI.