Merge branch 'master' into develop
Use size instead of count for accurate logging on transform
Additional index for performance
10x performance tweaks
Merge branch 'develop'