Add bootstrap support
Add bootstrap support
Merge branch 'bootstrap-integration'