Merging with the split-api branch