added changes from upstream; add missing files for bootstrap