Updated submodule includes after they were broken in 29a5944e62