Update changes
Merge branch 'release/1.7' into develop