Updated submodules after backports