Merge "fix(spmd): fix build error with spmd" into integration