Rebase onto latest bootstrap

Rebased onto latest bootstrap.