case 1683 - Little bit refactoring.
Merge branch 'case-1683' into develop