Release/1.7

Squashed and merged in 21ae430