Merge pull request #3041 from adrians:optimize_split