Merge upstream GitLab into Heptapod

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

Brings in 287 non-merge commits.

Merge request reports