Merge branch 'release/1.1.6' into develop
Merge remote-tracking branch 'upstream/develop'