Significant submodule changes as part of migrating framework to bootstrap