Merge upstream GitLab up to the 17.8 branching point

Georges Racinetrequested to merge
topic/heptapod-future/upstream-merge into branch/heptapod-future

Brings in 31 non-merge commits.

Merge request reports