Merge "fix(spm-mm): prevent excessive racing" into dev/topics/lts-v2.8.31-triage