Fix variable typos in splitter
Merge branch 'master' into patch-1