dev_bootstrap backport