Context

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

$ git checkout -b proto-k-backport-5731
$ git cherry-pick 3f1dd0f21e047ed7518a8150625e37bd680ed402^..6f4b58fec8dc88c851abbce62028c234e7081360

Resolved conflict in src/proto_alpha/lib_benchmarks_proto/interpreter_benchmarks.ml.

Manually testing the MR

Check CI.