removed duplicate item generation
Merge branch 'develop'