Merge remote-tracking branch 'origin/develop'

* origin/develop:
  case 2069 - Code cleanup.
Release: v1.9.6
Merge branch 'master' into develop

* master:
  Release: v1.9.6