Merge branch 'master' into develop
Case 3132 - Removed unused code.
Merge branch 'case-3132' into develop

* case-3132:
  Case 3132 - Removed unused code.
Merge branch 'develop'