Merge branch 'splitsettings'