release 1.1.7
Merge branch 'release/1.1.7' into develop