Merge pull request #702 from magieno/export-bootstrap-in-cli-to-use-it

Merge pull request #702 from magieno/export-bootstrap-in-cli-to-use-it #1650