Merge upstream GitLab Shell into Heptapod Shell

Brings in 2 non-merge commits.

Merge request reports

Loading