Context

!5676 (merged) is needed for clean backport of !5709 (merged) (see !5720 (merged)). Cherry-picked all commits from it using the following commands.

$ git checkout -b proto-k-backport-5676
$ git cherry-pick f1cba25a092169e0a96c18185eb246ef918aef4f^..41fa34dd61a0ff259cb98e7237358b3393d6ae6b

Manually testing the MR

Check CI.

Edited Jun 28, 2022 by Fedor Sheremetyev