Merge remote-tracking branch 'origin/develop'
Release: v1.9.6
Merge branch 'master' into develop