Topic/heptapod/merge stable
Merged heptapod-stable into heptapod for latest fixes
We get back what was done for 0.17.3 for the future 0.18.0
Merged heptapod-stable into heptapod for latest fixes
We get back what was done for 0.17.3 for the future 0.18.0