Merge branch 'release-1.7.0.2' into develop