[Process] Merge #8924 commits in master

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

The merge of #8924 is a bit easier than in 2.3 but conflicts remains. I've done it and fix unit tests latelay added on master that were failing on windows.
(see #8955)