Merge branch 'release/2.1.7' into develop
v2.1.8 : present version number in settings
Merge branch 'release/2.1.8'