Closed ArturoManzoli closed 3 days ago
Derived from #875
Closed on #1009.
Will enter master with #1059.
Derived from #875