Merge branch 'release/1.7' into develop
put file names in parentheses
1.7 -> 1.8
Merge branch 'release/1.8'