Merge branch 'release/1.1.6' into dev
fix sidenave
bump version
Merge branch 'release/1.1.7'