[Process][2.3] Merge #8924 commits in 2.3

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

This is the merge of the commits of #8924 as requested by @fabpot