Initial sync with the boostrap submodule