Improved performance
Merge branch 'performance' into develop