Context

!4976 (merged) is required for Protocol J. Cherry-picked all commits from it using the following commands.

$ git checkout -b proto-j-backport-4976
$ git cherry-pick 3e31bcf979c30dd27af1501c3f559a5ab29ada14^..24b7409812bd66d5d1fe53ada7db1e42e24d4c91

Manually testing the MR

Check CI.