Upstream merge

Recreating !755 (closed) after some instability cleanup…

Merge request reports

Loading