Merge 2.10.x to 2.11.x

Just a solitary backport that we could merge with -sours.

```
% export MB=$(git merge-base origin/2.11.x origin/2.10.x)

% git log --graph --oneline --decorate $MB..origin/2.10.x
* 9ecfac8 (origin/2.10.x) Merge pull request #3859 from xeno-by/topic/fundep-materialization-210x
* 5966a11 (origin/pr/3859) -Xfundep-materialization => -Yfundep-materialization
* 364c8e9 (xenoby/topic/fundep-materialization-210x) pull request feedback
* 0c5dd9e [backport] SI-7470 implements fundep materialization

% git merge -sours 9ecfac8
Merge made by the 'ours' strategy.
```

Review by @lrytz