Splitter Update from r299 to r409