Manual merge of GitLab upstream, step 9

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

Merge request reports