split-init #9

Open
whirigoyen wants to merge 7 commits from split-init into master

7 commits