Merge "Fix: fixing coverity issue for SPM Core." into integration