Context

Without changes in !4018 (merged), snapshotted "Protocol I" has Python test failures. Cherry-picked all commits from it using the following commands.

$ git checkout -b proto-i-backport-4018
$ git cherry-pick b6c684c649770f89bfb44008e64c62dbe95f94cd^..670bc0d991a2198b4c34e5a7749896d742a58fde

Manually testing the MR

Check CI.

Edited Dec 14, 2021 by Fedor Sheremetyev