feature #538: Changes using the new split function.

(cherry picked from commit 0cee3d7ac05c05f0a13e7dcf9e504021df98f6a2)