Merge new_spawn into devel
Fix bootstrapping