Update bootstrap with upstream