case 2124 - Bugfix: items duplication.
Merge branch 'case-2124' into develop