Merge "fix(spm-mm): prevent excessive racing" into integration