merges with upstream bootstrap