Merge "fix(spmd): coverity scan issues" into integration