Merge branch 'release/1.7'
Merge tag '1.7' into develop

Version 1.7