Merge branch 'master' into develop
Review @ Coding Standards.
case 1683 - Little bit refactoring.
Merge branch 'case-1683' into develop
Merge remote-tracking branch 'origin/develop'