Perfomance improved
Merge branch 'develop'