Add Bootstrap to build
Merge branch 'hotfix/BootstrapBuild'