Merge branch 'split-functions' into dt-test