fix shuffle, chunk count
Merge branch 'develop'