Merge upstream GitLab Shell into Heptapod Shell

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

Brings in 127 non-merge commits.

Merge request reports