Manual upstream merge

This is the second merge on the road to upstream v15.0 using the new extraction.

Merge request reports

Loading