Merge branch 'master' into public
trying to get splitter to work
merge public