Merge pull request #5234 from crosbymichael/refactor-container-start

Refactor container start