Merge branch 'master' into develop
case 2069 - Code cleanup.
Merge remote-tracking branch 'origin/develop'

* origin/develop:
  case 2069 - Code cleanup.