fix for the performance
Merge branch 'develop'