Start breaking out the bootstrap code into a unified function
Merge pull request #11026 from techhat/bootstrap

Start breaking out the bootstrap code into a unified function