Cleanup array split.
Merge branch 'develop'