Merge with upstream, update submodules