Remove optional split size. Tests fixed.
Merge branch 'master' into develop