Merged in upstream changes for submodules