Merge branch 'bootstrap-update'