Merge branch 'master' into develop

* master:
  Release: v1.9.6
case 2535 fix. Corrections according to CR on case 2535.
Merge branch 'case-2535-fix' into develop
Merge remote-tracking branch 'origin/develop'