Merge "SPM: Fix error codes size in SPMD handler" into integration