Merge heptapod-stable branch into heptapod

Part of #1837 (closed)

Merge request reports

Loading