update join split
Merge branch 'develop'