Upstream GitLab merge

Brings in 282 non-merge commits.

Edited by Georges Racinet

Merge request reports

Loading